Merge branch 'master' of git+ssh://openadk.org/git/openadk

3 files changed, 12 insertions, 51 deletions

diff --git a/package/jamvm/Makefile b/package/jamvm/Makefile
index b25833364..f596ed019 100644
--- a/package/jamvm/Makefile
+++ b/package/jamvm/Makefile
@@ -4,20 +4,18 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		jamvm
-PKG_VERSION:=		1.5.4
-PKG_RELEASE:=		5
-PKG_HASH:=		7865693698bc4322cabe1014a4b7ebdec1bc1daf45f1a4457b6e908a4446b124
+PKG_VERSION:=		2.0.0
+PKG_RELEASE:=		1
+PKG_HASH:=		76428e96df0ae9dd964c7a7c74c1e9a837e2f312c39e9a357fa8178f7eff80da
 PKG_DESCR:=		java virtual machine implementation
 PKG_SECTION:=		dev/lang
-PKG_DEPENDS:=		libffi zlib
+PKG_DEPENDS:=		libffi zlib libpthread librt
 PKG_BUILDDEP:=		libffi zlib
 PKG_URL:=		http://jamvm.sourceforge.net
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=jamvm/}
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
-PKG_ARCH_DEPENDS:=	!m68k
-
 include ${ADK_TOPDIR}/mk/host.mk
 include ${ADK_TOPDIR}/mk/package.mk
 
@@ -27,30 +25,21 @@ $(eval $(call PKG_template,JAMVM,jamvm,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPEN
 HOST_CONFIGURE_ARGS+=	--libdir=$(STAGING_HOST_DIR)/usr/lib/jamvm \
 			--includedir=$(STAGING_HOST_DIR)/usr/include/jamvm \
 			--with-classpath-install-dir=$(STAGING_HOST_DIR)/usr
-BUILD_STYLE:=		manual
-INSTALL_STYLE:=		manual
 
 CONFIGURE_ARGS+=	--enable-ffi
 
-hostpost-install:
-	ln -sf ${STAGING_HOST_DIR}/usr/bin/jamvm ${STAGING_HOST_DIR}/usr/lib/jvm/bin/java
-	ln -sf ${STAGING_HOST_DIR}/usr/bin/jamvm ${STAGING_HOST_DIR}/usr/lib/jvm/jre/bin/java
-
-do-build:
-	${INSTALL_DIR} ${WRKINST}/usr/bin
-	${INSTALL_DIR} ${WRKINST}/usr/share/jamvm
-	${MAKE} -C ${WRKBUILD}/src \
-	      ${TARGET_CONFIGURE_OPTS}
-	${CP} ${WRKBUILD}/src/jamvm ${WRKINST}/usr/bin
-	${MAKE} -C ${WRKBUILD}/lib
-	${CP} ${WRKBUILD}/lib/classes.zip ${WRKINST}/usr/share/jamvm
-
-do-install:
+jamvm-install:
 	${INSTALL_DIR} ${IDIR_JAMVM}/usr/bin
+	${INSTALL_DIR} ${IDIR_JAMVM}/usr/lib
 	${INSTALL_DIR} ${IDIR_JAMVM}/usr/share/jamvm
-	${INSTALL_BIN} ${WRKINST}/usr/bin/jamvm ${IDIR_JAMVM}/usr/bin
+	${INSTALL_BIN} ${WRKINST}/usr/bin/jamvm \
+		${IDIR_JAMVM}/usr/bin
 	${CP} ${WRKINST}/usr/share/jamvm/classes.zip \
 		${IDIR_JAMVM}/usr/share/jamvm
+	$(CP) ${WRKINST}/usr/lib/libjvm.so \
+		${IDIR_JAMVM}/usr/lib
+	$(CP) ${WRKINST}/usr/lib/rt.jar \
+		${IDIR_JAMVM}/usr/lib
 
 include ${ADK_TOPDIR}/mk/host-bottom.mk
 include ${ADK_TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/jamvm/patches/patch-ltmain_sh b/package/jamvm/patches/patch-ltmain_sh
deleted file mode 100644
index e7a6c8f5d..000000000
--- a/package/jamvm/patches/patch-ltmain_sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- jamvm-1.5.4.orig/ltmain.sh	2009-01-03 07:08:36.000000000 +0100
-+++ jamvm-1.5.4/ltmain.sh	2011-01-15 22:06:10.000000000 +0100
-@@ -1676,7 +1676,7 @@ EOF
-       # -F/path gives path to uninstalled frameworks, gcc on darwin
-       # @file GCC response files
-       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
--      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
-+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto)
- 
- 	# Unknown arguments in both finalize_command and compile_command need
- 	# to be aesthetically quoted because they are evaled later.
diff --git a/package/jamvm/patches/patch-src_os_linux_os_c b/package/jamvm/patches/patch-src_os_linux_os_c
deleted file mode 100644
index a867841e3..000000000
--- a/package/jamvm/patches/patch-src_os_linux_os_c
+++ /dev/null
@@ -1,17 +0,0 @@
---- jamvm-1.5.4.orig/src/os/linux/os.c	2009-12-31 19:40:48.000000000 +0100
-+++ jamvm-1.5.4/src/os/linux/os.c	2013-12-25 16:43:03.000000000 +0100
-@@ -46,10 +46,12 @@ void *nativeStackBase() {
- }
- 
- int nativeAvailableProcessors() {
--#ifdef __UCLIBC__
-+#if defined(__UCLIBC__)
-     return 1;
--#else
-+#elif defined(__GLIBC__)
-     return get_nprocs();
-+#else
-+    return 1;
- #endif
- }
-