From cbfd07701bfb747e7f75071d160b778799843383 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sun, 11 Aug 2019 13:58:21 -0700 Subject: [PATCH] jamvm: Add host build Needed for classpath. GCJ is also needed but that can be dealt with separately. Fix compilation with musl by defining _GNU_SOURCE. What's funny here is that if __USE_GNU gets replaced, the host build fails. The man page says _GNU_SOURCE for pthread_getattr_np but glibc violates that statement. Removed classpath dependency. classpaths must select jamvm, not the other way around. Removed target whitelist. Switched to blacklist. Fixed License information. Various other cleanups. Signed-off-by: Rosen Penev (cherry-picked from 2972cc98ebfb512d394ffe406410961545821936 and synced from master) --- lang/jamvm/Makefile | 17 ++++++++++------- lang/jamvm/patches/010-musl.patch | 12 ++++++++++++ 2 files changed, 22 insertions(+), 7 deletions(-) create mode 100644 lang/jamvm/patches/010-musl.patch diff --git a/lang/jamvm/Makefile b/lang/jamvm/Makefile index 53f23f685d..0db18b385b 100644 --- a/lang/jamvm/Makefile +++ b/lang/jamvm/Makefile @@ -9,28 +9,30 @@ include $(TOPDIR)/rules.mk PKG_NAME:=jamvm PKG_VERSION:=2.0.0 -PKG_RELEASE:=2 -PKG_LICENSE:=GPL-2.0+ -PKG_MAINTAINER:=Dana H. Myers +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/$(PKG_NAME) -PKG_MD5SUM:=a6e3321ef4b3cfb4afc20bd75452e11e +PKG_HASH:=76428e96df0ae9dd964c7a7c74c1e9a837e2f312c39e9a357fa8178f7eff80da -PKG_USE_MIPS16:=0 +PKG_MAINTAINER:=Dana H. Myers +PKG_LICENSE:=GPL-2.0-or-later +PKG_LICENSE_FILES:=COPYING PKG_FIXUP:=autoreconf PKG_INSTALL:=1 +PKG_USE_MIPS16:=0 include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/host-build.mk define Package/jamvm SUBMENU:=Java SECTION:=lang CATEGORY:=Languages TITLE:=A compact Java Virtual Machine - URL:=http://sourceforge.net/projects/jamvm - DEPENDS:=+zlib +libpthread +librt +classpath @!avr32 + URL:=http://jamvm.sourceforge.net/ + DEPENDS:=+zlib +libpthread +librt +CONFIG_powerpc64:libffi @!arc @!aarch64 endef define Package/jamvm/description @@ -65,3 +67,4 @@ define Build/InstallDev endef $(eval $(call BuildPackage,jamvm)) +$(eval $(call HostBuild)) diff --git a/lang/jamvm/patches/010-musl.patch b/lang/jamvm/patches/010-musl.patch new file mode 100644 index 0000000000..337012f416 --- /dev/null +++ b/lang/jamvm/patches/010-musl.patch @@ -0,0 +1,12 @@ +--- a/src/os/linux/os.c ++++ b/src/os/linux/os.c +@@ -26,6 +26,9 @@ + #include + + #define __USE_GNU ++#ifndef _GNU_SOURCE ++#define _GNU_SOURCE ++#endif + #include + #include +