toolchain/gcc: fix java support

Not runtime tested, but now it atleast builds.

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index d9f90fdeaf0c1ef1b7cf384b1852745ff5b35084..293cac092cbc6a2c1a12aeaca6712b9704e86ba3 100644 (file)
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -142,9 +142,13 @@ config BR2_GCC_CROSS_FORTRAN
        help
          Build a Fortran cross-compiler
 
+config BR2_GCC_CROSS_JAVA
+       bool
+
 config BR2_INSTALL_LIBGCJ
        bool "Build/install java compiler and libgcj?"
        depends on !BR2_avr32 && BR2_INSTALL_LIBSTDCPP
+       select BR2_GCC_CROSS_JAVA
        help
          Build/install java compiler and libgcj?
 

diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk
index 1894c5703b4cfa09b2a41ca17e4b877fb0260d00..8ecd97ad003e31fe82b477fa8943ac9caa14801c 100644 (file)
--- a/toolchain/gcc/gcc-uclibc-4.x.mk
+++ b/toolchain/gcc/gcc-uclibc-4.x.mk
@@ -80,6 +80,9 @@ endif
 ifeq ($(BR2_GCC_CROSS_FORTRAN),y)
 GCC_CROSS_LANGUAGES:=$(GCC_CROSS_LANGUAGES),fortran
 endif
+ifeq ($(BR2_GCC_CROSS_JAVA),y)
+GCC_CROSS_LANGUAGES:=$(GCC_CROSS_LANGUAGES),java
+endif
 ifeq ($(BR2_GCC_CROSS_OBJC),y)
 GCC_CROSS_LANGUAGES:=$(GCC_CROSS_LANGUAGES),objc
 endif
@@ -356,14 +359,11 @@ ifeq ($(BR2_GCC_SHARED_LIBGCC),y)
 endif
 endif
 ifeq ($(BR2_INSTALL_LIBGCJ),y)
-       cp -dpf $(STAGING_DIR)/lib/libgcj.so* $(TARGET_DIR)/lib/
-       cp -dpf $(STAGING_DIR)/lib/lib-org-w3c-dom.so* $(TARGET_DIR)/lib/
-       cp -dpf $(STAGING_DIR)/lib/lib-org-xml-sax.so* $(TARGET_DIR)/lib/
+       cp -dpf $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib/libgcj.so* $(TARGET_DIR)/usr/lib/
        mkdir -p $(TARGET_DIR)/usr/lib/security
-       cp -dpf $(STAGING_DIR)/usr/lib/security/libgcj.security \
-               $(TARGET_DIR)/usr/lib/security/
        cp -dpf $(STAGING_DIR)/usr/lib/security/classpath.security \
                $(TARGET_DIR)/usr/lib/security/
+       -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libgcj.so*
 endif
        mkdir -p $(@D)
        touch $@