summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/cacaovm/Makefile50
-rw-r--r--package/cacaovm/patches/patch-src_cacaoh_headers_c14
-rw-r--r--package/cacaovm/patches/patch-src_threads_posix_thread-posix_h14
-rw-r--r--package/classpath/patches/patch-configure11
-rw-r--r--package/libgcj/Makefile27
5 files changed, 11 insertions, 105 deletions
diff --git a/package/cacaovm/Makefile b/package/cacaovm/Makefile
deleted file mode 100644
index 1d85a420a..000000000
--- a/package/cacaovm/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-# 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
-
-PKG_NAME:= cacaovm
-PKG_VERSION:= 0.99.4
-PKG_RELEASE:= 1
-PKG_MD5SUM:= 63220327925ace13756ae334c55a3baa
-PKG_DESCR:= Java VM
-PKG_SECTION:= lang
-PKG_BUILDDEP:= classpath zlib
-PKG_DEPENDS:= classpath zlib
-PKG_URL:= http://www.cacaovm.org/
-PKG_SITES:= http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-0.99.4/
-
-WRKDIST= ${WRKDIR}/cacao-${PKG_VERSION}
-DISTFILES:= cacao-${PKG_VERSION}.tar.bz2
-
-include $(TOPDIR)/mk/package.mk
-
-$(eval $(call PKG_template,CACAOVM,cacaovm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-CONFIGURE_ARGS+= --with-jni_md_h=${STAGING_TARGET_DIR}/usr/include \
- --with-java-runtime-library-prefix=${STAGING_TARGET_DIR}/usr \
- --with-cacaoh=${STAGING_TARGET_DIR}/bin/cacaoh
-
-post-patch:
- (cd ${WRKBUILD}; ./configure \
- --enable-jit \
- --with-java-runtime-library-prefix=/opt/local \
- --enable-gc=none \
- );
- $(MAKE) -C ${WRKBUILD}/src/vmcore
- $(MAKE) -C ${WRKBUILD}/src/toolbox
- $(MAKE) -C ${WRKBUILD}/src/cacaoh
- $(CP) $(WRKBUILD)/src/cacaoh/cacaoh $(STAGING_TARGET_DIR)/bin
- $(MAKE) -C ${WRKBUILD} clean
-
-cacaovm-install:
- $(INSTALL_DIR) $(IDIR_CACAOVM)/usr/lib
- $(CP) $(WRKINST)/usr/lib/libjvm.so $(IDIR_CACAOVM)/usr/lib
- $(INSTALL_DIR) $(IDIR_CACAOVM)/usr/bin
- $(INSTALL_BIN) $(WRKINST)/usr/bin/cacao $(IDIR_CACAOVM)/usr/bin
- $(INSTALL_BIN) $(WRKINST)/usr/bin/java $(IDIR_CACAOVM)/usr/bin
- $(INSTALL_DIR) $(IDIR_CACAOVM)/usr/share/cacao
- $(CP) $(WRKINST)/usr/share/cacao/vm.zip \
- $(IDIR_CACAOVM)/usr/share/cacao
-
-include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/cacaovm/patches/patch-src_cacaoh_headers_c b/package/cacaovm/patches/patch-src_cacaoh_headers_c
deleted file mode 100644
index 0e1ca0923..000000000
--- a/package/cacaovm/patches/patch-src_cacaoh_headers_c
+++ /dev/null
@@ -1,14 +0,0 @@
---- cacao-0.99.4.orig/src/cacaoh/headers.c 2008-08-04 18:51:28.000000000 +0200
-+++ cacao-0.99.4/src/cacaoh/headers.c 2011-03-26 20:11:11.000000000 +0100
-@@ -35,8 +35,10 @@
- #if defined(ENABLE_THREADS)
- # if defined(__DARWIN__)
- # include <signal.h>
-+# include <sys/ucontext.h>
-+# else
-+# include <ucontext.h>
- # endif
--# include <ucontext.h>
- #endif
-
- #include "mm/gc-common.h"
diff --git a/package/cacaovm/patches/patch-src_threads_posix_thread-posix_h b/package/cacaovm/patches/patch-src_threads_posix_thread-posix_h
deleted file mode 100644
index fc43526fb..000000000
--- a/package/cacaovm/patches/patch-src_threads_posix_thread-posix_h
+++ /dev/null
@@ -1,14 +0,0 @@
---- cacao-0.99.4.orig/src/threads/posix/thread-posix.h 2008-08-04 18:51:28.000000000 +0200
-+++ cacao-0.99.4/src/threads/posix/thread-posix.h 2011-03-26 20:12:13.000000000 +0100
-@@ -34,7 +34,11 @@ typedef struct threadobject threadobject
- #include "config.h"
-
- #include <pthread.h>
-+#if defined(__DARWIN__)
-+#include <sys/ucontext.h>
-+#else
- #include <ucontext.h>
-+#endif
-
- #include "vm/types.h"
-
diff --git a/package/classpath/patches/patch-configure b/package/classpath/patches/patch-configure
new file mode 100644
index 000000000..df2f41eae
--- /dev/null
+++ b/package/classpath/patches/patch-configure
@@ -0,0 +1,11 @@
+--- classpath-0.98.orig/configure 2009-02-06 02:01:30.000000000 +0100
++++ classpath-0.98/configure 2011-04-11 17:08:29.347661221 +0200
+@@ -30403,7 +30403,7 @@ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_gmp___gmpz_mul_si" >&5
+ $as_echo "$ac_cv_lib_gmp___gmpz_mul_si" >&6; }
+ if test "x$ac_cv_lib_gmp___gmpz_mul_si" = x""yes; then
+- GMP_CFLAGS=-I/usr/include
++ GMP_CFLAGS=
+ GMP_LIBS=-lgmp
+ else
+ GMP_CFLAGS=
diff --git a/package/libgcj/Makefile b/package/libgcj/Makefile
deleted file mode 100644
index 7be43c3e1..000000000
--- a/package/libgcj/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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