summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2015-05-16 18:09:18 -0500
committerWaldemar Brodkorb <wbx@openadk.org>2015-05-16 18:09:42 -0500
commite44483e2012dfa92e15b7d02168caefdef9803aa (patch)
treea443e1f93d1ecfad7ecbb93262cc283383ea6f61
parentb9f38fd924dc5e2b6ed5b44eee37ec9d470192d4 (diff)
fix jamvm package build
-rw-r--r--package/jamvm/Makefile23
1 files changed, 9 insertions, 14 deletions
diff --git a/package/jamvm/Makefile b/package/jamvm/Makefile
index 96ffd3296..f596ed019 100644
--- a/package/jamvm/Makefile
+++ b/package/jamvm/Makefile
@@ -9,7 +9,7 @@ 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/}
@@ -26,25 +26,20 @@ 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
-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