luajit_2_1: 2.1.0-2021-08-12 -> 2.1.0-2021-10-27

This commit is contained in:
Luka Blaskovic 2021-11-07 07:36:49 +00:00
parent 83c93c8e1c
commit 90a564a133
3 changed files with 3 additions and 21 deletions

View File

@ -1,8 +1,8 @@
{ self, callPackage }:
callPackage ./default.nix {
inherit self;
version = "2.1.0-2021-08-12";
rev = "8ff09d9f5ad5b037926be2a50dc32b681c5e7597";
version = "2.1.0-2021-10-27";
rev = "b4b2dce9fc3ffaaaede39b36d06415311e2aa516";
isStable = false;
sha256 = "18wp8sgmiwlslnvgs35cy35ji2igksyfm3f8hrx07hqmsq2d77vr";
sha256 = "185s071aa0yffz8npgdxj7l98cs987vddb2l5pzfcdqfj41gn55q";
}

View File

@ -1,14 +0,0 @@
diff --git a/src/Makefile b/src/Makefile
index 2538503f..7e6380da 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -320,7 +320,9 @@ ifeq (Darwin,$(TARGET_SYS))
$(error missing: export MACOSX_DEPLOYMENT_TARGET=XX.YY)
endif
TARGET_STRIP+= -x
+ ifneq (arm64,$(shell uname -m))
TARGET_XCFLAGS+= -DLUAJIT_UNWIND_EXTERNAL
+ endif
TARGET_XSHLDFLAGS= -dynamiclib -single_module -undefined dynamic_lookup -fPIC
TARGET_DYNXLDOPTS=
TARGET_XSHLDFLAGS+= -install_name $(TARGET_DYLIBPATH) -compatibility_version $(MAJVER).$(MINVER) -current_version $(MAJVER).$(MINVER).$(RELVER)

View File

@ -51,10 +51,6 @@ stdenv.mkDerivation rec {
luaversion = "5.1";
# Fix for pcall on aarch64-darwin.
# Upstream issue: https://github.com/LuaJIT/LuaJIT/issues/698
patches = lib.optionals (stdenv.hostPlatform.system == "aarch64-darwin") [ ./aarch64-darwin-disable-unwind-external.patch ];
postPatch = ''
substituteInPlace Makefile --replace ldconfig :
if test -n "''${dontStrip-}"; then