summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2011-03-24 18:21:33 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2011-03-24 18:21:33 +0100
commit6aeae777249891e78bd2125a1c0eb3ac4eef1d69 (patch)
treeebd4301f4946641751455be64872e1cdc59858d0
parentec16e71066199ce512767db53b913cce975e5662 (diff)
enable Java support in GCC again, add libgcj library package
-rw-r--r--package/libgcj/Makefile27
-rw-r--r--package/libgcj/files/libpthread.so.x865
-rw-r--r--package/libgcj/files/libpthread.so.x86_645
-rw-r--r--toolchain/Config.in11
4 files changed, 43 insertions, 5 deletions
diff --git a/package/libgcj/Makefile b/package/libgcj/Makefile
new file mode 100644
index 000000000..7be43c3e1
--- /dev/null
+++ b/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
diff --git a/package/libgcj/files/libpthread.so.x86 b/package/libgcj/files/libpthread.so.x86
new file mode 100644
index 000000000..e7555c820
--- /dev/null
+++ b/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 )
diff --git a/package/libgcj/files/libpthread.so.x86_64 b/package/libgcj/files/libpthread.so.x86_64
new file mode 100644
index 000000000..b0e31f904
--- /dev/null
+++ b/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 )
diff --git a/toolchain/Config.in b/toolchain/Config.in
index 8df7952b2..dd0e5ab34 100644
--- a/toolchain/Config.in
+++ b/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