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 <rosenp@gmail.com>
(cherry-picked from 2972cc98eb and synced
from master)
This commit is contained in:
Rosen Penev 2019-08-11 13:58:21 -07:00
parent 539c26b2ea
commit cbfd07701b
2 changed files with 22 additions and 7 deletions

View File

@ -9,28 +9,30 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=jamvm PKG_NAME:=jamvm
PKG_VERSION:=2.0.0 PKG_VERSION:=2.0.0
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_LICENSE:=GPL-2.0+
PKG_MAINTAINER:=Dana H. Myers <k6jq@comcast.net>
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@SF/$(PKG_NAME) PKG_SOURCE_URL:=@SF/$(PKG_NAME)
PKG_MD5SUM:=a6e3321ef4b3cfb4afc20bd75452e11e PKG_HASH:=76428e96df0ae9dd964c7a7c74c1e9a837e2f312c39e9a357fa8178f7eff80da
PKG_USE_MIPS16:=0 PKG_MAINTAINER:=Dana H. Myers <k6jq@comcast.net>
PKG_LICENSE:=GPL-2.0-or-later
PKG_LICENSE_FILES:=COPYING
PKG_FIXUP:=autoreconf PKG_FIXUP:=autoreconf
PKG_INSTALL:=1 PKG_INSTALL:=1
PKG_USE_MIPS16:=0
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/host-build.mk
define Package/jamvm define Package/jamvm
SUBMENU:=Java SUBMENU:=Java
SECTION:=lang SECTION:=lang
CATEGORY:=Languages CATEGORY:=Languages
TITLE:=A compact Java Virtual Machine TITLE:=A compact Java Virtual Machine
URL:=http://sourceforge.net/projects/jamvm URL:=http://jamvm.sourceforge.net/
DEPENDS:=+zlib +libpthread +librt +classpath @!avr32 DEPENDS:=+zlib +libpthread +librt +CONFIG_powerpc64:libffi @!arc @!aarch64
endef endef
define Package/jamvm/description define Package/jamvm/description
@ -65,3 +67,4 @@ define Build/InstallDev
endef endef
$(eval $(call BuildPackage,jamvm)) $(eval $(call BuildPackage,jamvm))
$(eval $(call HostBuild))

View File

@ -0,0 +1,12 @@
--- a/src/os/linux/os.c
+++ b/src/os/linux/os.c
@@ -26,6 +26,9 @@
#include <sys/sysinfo.h>
#define __USE_GNU
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
#include <dlfcn.h>
#include <pthread.h>