Browse Source

enable Java support in GCC again, add libgcj library package

Waldemar Brodkorb 14 years ago
parent
commit
6aeae77724

+ 27 - 0
package/libgcj/Makefile

@@ -0,0 +1,27 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include ${TOPDIR}/rules.mk
+include ${TOPDIR}/toolchain/gcc/Makefile.inc
+
+PKG_NAME:=		libgcj
+PKG_DESCR:=		GCJ runtime library
+PKG_SECTION:=		libs
+
+NO_DISTFILES:=		1
+
+include ${TOPDIR}/mk/package.mk
+
+$(eval $(call PKG_template,LIBGCJ,libgcj,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+CONFIG_STYLE:=		manual
+BUILD_STYLE:=		manual
+INSTALL_STYLE:=		manual
+
+libgcj-install:
+ifeq ($(ADK_NATIVE),)
+	${INSTALL_DIR} ${IDIR_LIBGCJ}/lib
+	${CP} ${STAGING_TARGET_DIR}/lib/libgcj*.so* ${IDIR_LIBGCJ}/lib
+endif
+
+include ${TOPDIR}/mk/pkg-bottom.mk

+ 5 - 0
package/libgcj/files/libpthread.so.x86

@@ -0,0 +1,5 @@
+/* GNU ld script
+   Use the shared library, but some functions are only in
+   the static library, so try that secondarily.  */
+OUTPUT_FORMAT(elf32-i386)
+GROUP ( /lib/libpthread.so.0 /usr/lib/libpthread_nonshared.a )

+ 5 - 0
package/libgcj/files/libpthread.so.x86_64

@@ -0,0 +1,5 @@
+/* GNU ld script
+   Use the shared library, but some functions are only in
+   the static library, so try that secondarily.  */
+OUTPUT_FORMAT(elf64-x86-64)
+GROUP ( /lib/libpthread.so.0 /usr/lib/libpthread_nonshared.a )

+ 6 - 5
toolchain/Config.in

@@ -10,11 +10,12 @@ config ADK_TOOLCHAIN_GCC_CXX
 	boolean
 	default y
 
-#config ADK_TOOLCHAIN_GCC_JAVA
-#	prompt "Enable building of GCJ (Java language support in GCC)"
-#	boolean
-#	default n
-#
+config ADK_TOOLCHAIN_GCC_JAVA
+	prompt "Enable building of GCJ (Java language support in GCC)"
+	boolean
+	select ADK_PACKAGE_LIBGCJ
+	default n
+
 #config ADK_TOOLCHAIN_GCC_OBJC
 #	prompt "Enable building of Objective C compiler"
 #	boolean