diff options
author | Peter Korsgaard <peter@korsgaard.com> | 2016-12-01 22:22:06 +0100 |
---|---|---|
committer | Peter Korsgaard <peter@korsgaard.com> | 2016-12-01 22:29:56 +0100 |
commit | 8852f08eeda3c9ff4c5f9cc90a169338bda1bff9 (patch) | |
tree | 8b22aaa4e3c283a73fe2af2eccdfa3926a5430ef /package/moarvm | |
parent | 42dd856ca930f79a831361e337d25fb8dd6e0dd1 (diff) | |
parent | 4f29cc436b24a8007b065253babe27b9346a479e (diff) |
Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/moarvm')
-rw-r--r-- | package/moarvm/Config.in | 3 | ||||
-rw-r--r-- | package/moarvm/moarvm.hash | 2 | ||||
-rw-r--r-- | package/moarvm/moarvm.mk | 10 |
3 files changed, 12 insertions, 3 deletions
diff --git a/package/moarvm/Config.in b/package/moarvm/Config.in index 69d9a3e42..c6e1efa39 100644 --- a/package/moarvm/Config.in +++ b/package/moarvm/Config.in @@ -9,6 +9,9 @@ config BR2_PACKAGE_MOARVM select BR2_PACKAGE_LIBUV select BR2_PACKAGE_LIBTOMMATH select BR2_PACKAGE_LIBATOMIC_OPS + # dyncall does not work on MIPS; libffi needs to be used. + # See: https://github.com/MoarVM/MoarVM/issues/222 + select BR2_PACKAGE_LIBFFI if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el help Short for "Metamodel On A Runtime", MoarVM is a virtual machine built especially for Rakudo Perl 6 and the NQP Compiler Toolchain. diff --git a/package/moarvm/moarvm.hash b/package/moarvm/moarvm.hash index 514a1bfe8..2e49811d1 100644 --- a/package/moarvm/moarvm.hash +++ b/package/moarvm/moarvm.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 d8cb9fe74267dd933c3e405b098dea99cb9c0561aedb06e8efd8ddaef43396d0 MoarVM-2016.10.tar.gz +sha256 5eaa8ff47b1c25e023a900947f88222fffe0884ce74652659ecd2265ae2d1387 MoarVM-2016.11.tar.gz diff --git a/package/moarvm/moarvm.mk b/package/moarvm/moarvm.mk index d2421fd78..d09117471 100644 --- a/package/moarvm/moarvm.mk +++ b/package/moarvm/moarvm.mk @@ -4,13 +4,13 @@ # ################################################################################ -MOARVM_VERSION = 2016.10 +MOARVM_VERSION = 2016.11 MOARVM_SITE = http://moarvm.com/releases MOARVM_SOURCE = MoarVM-$(MOARVM_VERSION).tar.gz MOARVM_LICENSE = Artistic-2.0 MOARVM_LICENSE_FILES = Artistic2.txt MOARVM_INSTALL_STAGING = YES -MOARVM_DEPENDENCIES = host-luajit libuv libtommath libatomic_ops +MOARVM_DEPENDENCIES = host-luajit host-pkgconf libuv libtommath libatomic_ops MOARVM_CONF_OPTS = \ --build=$(GNU_HOST_NAME) \ @@ -19,11 +19,17 @@ MOARVM_CONF_OPTS = \ --cc="$(TARGET_CC)" \ --ld="$(TARGET_CC)" \ --prefix="/usr" \ + --pkgconfig=$(PKG_CONFIG_HOST_BINARY) \ --lua=$(HOST_DIR)/usr/bin/luajit \ --has-libuv \ --has-libtommath \ --has-libatomic +ifeq ($(BR2_PACKAGE_LIBFFI),y) +MOARVM_CONF_OPTS += --has-libffi +MOARVM_DEPENDENCIES += libffi +endif + ifeq ($(BR2_ENDIAN),"BIG") MOARVM_CONF_OPTS += --big-endian endif |