pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
LuaJIT*: Update and sync
Module Name: pkgsrc-wip
Committed By: Malte Dehling <mdehling%gmail.com@localhost>
Pushed By: mdehling
Date: Thu Apr 4 12:28:42 2024 -0700
Changeset: 02af3851356b4faa73b98c6a24474e403ab6b581
Modified Files:
LuaJIT-git/Makefile
LuaJIT-git/PLIST
LuaJIT-git/buildlink3.mk
LuaJIT-git/distinfo
LuaJIT-git/platform.mk
LuaJIT2/Makefile
LuaJIT2/buildlink3.mk
LuaJIT2/distinfo
LuaJIT2/patches/patch-src_Makefile
LuaJIT2/platform.mk
LuaJIT21/Makefile
LuaJIT21/PLIST
LuaJIT21/buildlink3.mk
LuaJIT21/distinfo
LuaJIT21/patches/patch-Makefile
LuaJIT21/patches/patch-src_Makefile
Added Files:
LuaJIT-git/patches/patch-src_Makefile
LuaJIT21/platform.mk
Log Message:
LuaJIT*: Update and sync
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=02af3851356b4faa73b98c6a24474e403ab6b581
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
LuaJIT-git/Makefile | 12 +++++++++-
LuaJIT-git/PLIST | 6 ++---
LuaJIT-git/buildlink3.mk | 3 +--
LuaJIT-git/distinfo | 1 +
LuaJIT-git/patches/patch-src_Makefile | 16 +++++++++++++
LuaJIT-git/platform.mk | 8 +++----
LuaJIT2/Makefile | 5 ++--
LuaJIT2/buildlink3.mk | 1 +
LuaJIT2/distinfo | 2 +-
LuaJIT2/patches/patch-src_Makefile | 11 +++++----
LuaJIT2/platform.mk | 12 +++++-----
LuaJIT21/Makefile | 32 ++++++++++++-------------
LuaJIT21/PLIST | 38 +++++++++++++++--------------
LuaJIT21/buildlink3.mk | 7 +++---
LuaJIT21/distinfo | 10 ++++----
LuaJIT21/patches/patch-Makefile | 45 +++++------------------------------
LuaJIT21/patches/patch-src_Makefile | 12 +++++-----
LuaJIT21/platform.mk | 18 ++++++++++++++
18 files changed, 127 insertions(+), 112 deletions(-)
diffs:
diff --git a/LuaJIT-git/Makefile b/LuaJIT-git/Makefile
index a3e0743c39..7b86d78fe1 100644
--- a/LuaJIT-git/Makefile
+++ b/LuaJIT-git/Makefile
@@ -1,7 +1,7 @@
# $NetBSD$
DISTNAME= LuaJIT-git-2.1
-CATEGORIES= lang
+CATEGORIES= lang lua
GIT_REPO= https://luajit.org/git/luajit.git
GIT_BRANCH= v2.1
@@ -26,6 +26,16 @@ ONLY_FOR_PLATFORM+= *-*-x86_64
PTHREAD_OPTS+= native
PTHREAD_AUTO_VARS= yes
+.include "../../mk/bsd.prefs.mk"
+
+# Upstream doesn't support building shared libs on SunOS
+# http://www.freelists.org/post/luajit/LuaJIT-on-solaris-64
+PLIST_VARS+= shared
+.if ${OPSYS} != "SunOS"
+PLIST.shared= yes
+.endif
+PRINT_PLIST_AWK+= {if ($$0 ~ /\.so/) {$$0 = "$${PLIST.shared}" $$0;}}
+
.include "../../mk/pthread.buildlink3.mk"
.include "../../wip/mk/git-package.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/LuaJIT-git/PLIST b/LuaJIT-git/PLIST
index d1b39fc6de..cac52c5d75 100644
--- a/LuaJIT-git/PLIST
+++ b/LuaJIT-git/PLIST
@@ -8,9 +8,9 @@ include/luajit-${PKGVERSION}/luaconf.h
include/luajit-${PKGVERSION}/luajit.h
include/luajit-${PKGVERSION}/lualib.h
lib/libluajit-5.1.a
-lib/libluajit-5.1.so
-lib/libluajit-5.1.so.2
-lib/libluajit-5.1.so.${PKGVERSION}
+${PLIST.shared}lib/libluajit-5.1.so
+${PLIST.shared}lib/libluajit-5.1.so.2
+${PLIST.shared}lib/libluajit-5.1.so.${PKGVERSION}
lib/pkgconfig/luajit.pc
man/man1/luajit.1
share/luajit-${PKGVERSION}/jit/bc.lua
diff --git a/LuaJIT-git/buildlink3.mk b/LuaJIT-git/buildlink3.mk
index 5c2930dc3f..9def2d4dd2 100644
--- a/LuaJIT-git/buildlink3.mk
+++ b/LuaJIT-git/buildlink3.mk
@@ -7,8 +7,7 @@ LUAJIT_GIT_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.LuaJIT-git+= LuaJIT-git>=2.1
BUILDLINK_PKGSRCDIR.LuaJIT-git?= ../../wip/LuaJIT-git
-
-BUILDLINK_CFLAGS.LuaJIT-git+= -I${BUILDLINK_PREFIX.LuaJIT-git}/include/luajit-2.1
+BUILDLINK_INCDIRS.LuaJIT-git+= include/luajit-2.1
.endif # LUAJIT_GIT_BUILDLINK3_MK
BUILDLINK_TREE+= -LuaJIT-git
diff --git a/LuaJIT-git/distinfo b/LuaJIT-git/distinfo
index f85bc31921..63d7763cec 100644
--- a/LuaJIT-git/distinfo
+++ b/LuaJIT-git/distinfo
@@ -1,3 +1,4 @@
$NetBSD$
SHA1 (patch-Makefile) = 501b04456565d240acbce282130336f77b1e37f9
+SHA1 (patch-src_Makefile) = 4e2bf613cd73a8da33c261cbbf3ad9e6d8c09976
diff --git a/LuaJIT-git/patches/patch-src_Makefile b/LuaJIT-git/patches/patch-src_Makefile
new file mode 100644
index 0000000000..dc07e4b7eb
--- /dev/null
+++ b/LuaJIT-git/patches/patch-src_Makefile
@@ -0,0 +1,16 @@
+$NetBSD$
+
+fix building on darwin
+
+--- src/Makefile.orig 2024-04-04 18:49:03.922005656 +0000
++++ src/Makefile
+@@ -315,9 +315,6 @@ ifeq (,$(shell $(TARGET_CC) -o /dev/null
+ TARGET_XCFLAGS+= -fno-stack-protector
+ endif
+ ifeq (Darwin,$(TARGET_SYS))
+- ifeq (,$(MACOSX_DEPLOYMENT_TARGET))
+- $(error missing: export MACOSX_DEPLOYMENT_TARGET=XX.YY)
+- endif
+ TARGET_STRIP+= -x
+ TARGET_XCFLAGS+= -DLUAJIT_UNWIND_EXTERNAL
+ TARGET_XSHLDFLAGS= -dynamiclib -single_module -undefined dynamic_lookup -fPIC
diff --git a/LuaJIT-git/platform.mk b/LuaJIT-git/platform.mk
index 3bf5277e60..74e222161e 100644
--- a/LuaJIT-git/platform.mk
+++ b/LuaJIT-git/platform.mk
@@ -4,12 +4,12 @@
.if !defined(PLATFORM_SUPPORTS_LUAJIT)
-. for _luajit_arch in aarch64* *arm* i386 mips* powerpc x86_64
-LUAJIT_PLATFORMS+= *-*-${_luajit_arch}
+. for luajit_arch in aarch64* *arm* i386 mips* powerpc x86_64
+LUAJIT_PLATFORMS+= *-*-${luajit_arch}
. endfor
-. for _luajit_platform in ${LUAJIT_PLATFORMS}
-. if !empty(MACHINE_PLATFORM:M${_luajit_platform})
+. for luajit_platform in ${LUAJIT_PLATFORMS}
+. if !empty(MACHINE_PLATFORM:M${luajit_platform})
PLATFORM_SUPPORTS_LUAJIT= yes
. endif
. endfor
diff --git a/LuaJIT2/Makefile b/LuaJIT2/Makefile
index 623424d2c6..8c496897fe 100644
--- a/LuaJIT2/Makefile
+++ b/LuaJIT2/Makefile
@@ -12,9 +12,10 @@ HOMEPAGE= https://luajit.org/
COMMENT= Just-In-Time Compiler for the Lua programming language
LICENSE= mit
+CONFLICTS+= LuaJIT21-[0-9]* LuaJIT-git-[0-9]*
+
USE_TOOLS+= gmake
-# LuaJIT 2.1 supports mips64 and aarch64.
ONLY_FOR_PLATFORM+= *-*-*arm*
ONLY_FOR_PLATFORM+= *-*-i386
ONLY_FOR_PLATFORM+= *-*-mipseb
@@ -22,7 +23,7 @@ ONLY_FOR_PLATFORM+= *-*-mipsel
ONLY_FOR_PLATFORM+= *-*-powerpc
ONLY_FOR_PLATFORM+= *-*-x86_64
-# Address pkg/47587 lua not linked to pthread causes issues with modules
+# pkg/47587: lua not linked to pthread causes issues with modules
PTHREAD_OPTS+= native
PTHREAD_AUTO_VARS= yes
diff --git a/LuaJIT2/buildlink3.mk b/LuaJIT2/buildlink3.mk
index 03f2e73dce..c84bb11abc 100644
--- a/LuaJIT2/buildlink3.mk
+++ b/LuaJIT2/buildlink3.mk
@@ -7,6 +7,7 @@ LUAJIT2_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.LuaJIT2+= LuaJIT2>=2.0.3
BUILDLINK_PKGSRCDIR.LuaJIT2?= ../../wip/LuaJIT2
+BUILDLINK_INCDIRS.LuaJIT2+= include/luajit-2.0
.endif # LUAJIT2_BUILDLINK3_MK
BUILDLINK_TREE+= -LuaJIT2
diff --git a/LuaJIT2/distinfo b/LuaJIT2/distinfo
index 3202c10378..7588258c04 100644
--- a/LuaJIT2/distinfo
+++ b/LuaJIT2/distinfo
@@ -4,6 +4,6 @@ BLAKE2s (LuaJIT-2.0.1710087801-cae361187e7e1e3545353fb560c032cdace32d5f.tar.gz)
SHA512 (LuaJIT-2.0.1710087801-cae361187e7e1e3545353fb560c032cdace32d5f.tar.gz) = ec460b76f7cbbe7a63bede04926dbd0984ab3bbf82bc7410f4b00471ac8e0faef96e81270a5e584cf002c0bbf0708337485629b360db9bd1c2f15d8ac4ff5027
Size (LuaJIT-2.0.1710087801-cae361187e7e1e3545353fb560c032cdace32d5f.tar.gz) = 845112 bytes
SHA1 (patch-Makefile) = 35fcad24934861c566539074a7f8e62ddf6c06f8
-SHA1 (patch-src_Makefile) = 43234d5e008c37d950252f00fe70346f67e7679b
+SHA1 (patch-src_Makefile) = 8375e4c296bcd47506fe6c3a5b8a6af972426fc3
SHA1 (patch-src_lj__ccallback.c) = 8032bc451a504ae9538fb0ae4cc1ee729ede3a70
SHA1 (patch-src_lj__mcode.c) = c150e0b07ab441e983ace21e0e813fd4334290b5
diff --git a/LuaJIT2/patches/patch-src_Makefile b/LuaJIT2/patches/patch-src_Makefile
index 51d9f4c962..6bf913b620 100644
--- a/LuaJIT2/patches/patch-src_Makefile
+++ b/LuaJIT2/patches/patch-src_Makefile
@@ -2,14 +2,15 @@ $NetBSD$
Fix building on OS X.
---- src/Makefile.orig 2023-08-21 01:06:26.000000000 +0000
+--- src/Makefile.orig 2024-03-10 16:23:21.000000000 +0000
+++ src/Makefile
-@@ -302,7 +302,7 @@ ifeq (,$(shell $(TARGET_CC) -o /dev/null
+@@ -301,9 +301,6 @@ ifeq (,$(shell $(TARGET_CC) -o /dev/null
+ TARGET_XCFLAGS+= -fno-stack-protector
endif
ifeq (Darwin,$(TARGET_SYS))
- ifeq (,$(MACOSX_DEPLOYMENT_TARGET))
+- ifeq (,$(MACOSX_DEPLOYMENT_TARGET))
- $(error missing: export MACOSX_DEPLOYMENT_TARGET=XX.YY)
-+ export MACOSX_DEPLOYMENT_TARGET=10.4
- endif
+- endif
TARGET_STRIP+= -x
TARGET_XSHLDFLAGS= -dynamiclib -single_module -undefined dynamic_lookup -fPIC
+ TARGET_DYNXLDOPTS=
diff --git a/LuaJIT2/platform.mk b/LuaJIT2/platform.mk
index 679c094a64..8a2e096247 100644
--- a/LuaJIT2/platform.mk
+++ b/LuaJIT2/platform.mk
@@ -1,18 +1,18 @@
-# $NetBSD: platform.mk,v 1.1 2020/06/24 11:16:00 nia Exp $
+# $NetBSD$
.include "../../mk/bsd.fast.prefs.mk"
.if !defined(PLATFORM_SUPPORTS_LUAJIT)
-. for _luajit_arch in *arm* i386 mipseb mipsel powerpc x86_64
-LUAJIT_PLATFORMS+= *-*-${_luajit_arch}
+. for luajit_arch in *arm* i386 mipseb mipsel powerpc x86_64
+LUAJIT_PLATFORMS+= *-*-${luajit_arch}
. endfor
-. for _luajit_platform in ${LUAJIT_PLATFORMS}
-. if !empty(MACHINE_PLATFORM:M${_luajit_platform})
+. for luajit_platform in ${LUAJIT_PLATFORMS}
+. if !empty(MACHINE_PLATFORM:M${luajit_platform})
PLATFORM_SUPPORTS_LUAJIT= yes
. endif
. endfor
PLATFORM_SUPPORTS_LUAJIT?= no
-.endif # !defined(PLATFORM_SUPPORTS_LUAJIT)
+.endif # !defined(PLATFORM_SUPPORTS_LUAJIT)
diff --git a/LuaJIT21/Makefile b/LuaJIT21/Makefile
index aa0ac57779..a105b0ae6e 100644
--- a/LuaJIT21/Makefile
+++ b/LuaJIT21/Makefile
@@ -1,34 +1,34 @@
-# $NetBSD: Makefile,v 1.11 2017/09/16 19:53:51 alnsn Exp $
-#
+# $NetBSD$
-DISTNAME= LuaJIT-2.1.0-beta3
-PKGNAME= ${DISTNAME:S/LuaJIT/LuaJIT21/:S/-beta/beta/}
-CATEGORIES= lang
-MASTER_SITES= http://luajit.org/download/
+DISTNAME= LuaJIT-2.1.1710088188 # see .relver
+PKGNAME= ${DISTNAME:S/LuaJIT/LuaJIT21/}
+CATEGORIES= lang lua
+MASTER_SITES= ${MASTER_SITE_GITHUB:=LuaJIT/}
+GITHUB_PROJECT= ${DISTNAME:C/-[^-]*$//}
+GITHUB_TAG= d06beb0480c5d1eb53b3343e78063950275aa281
-MAINTAINER= alnsn%NetBSD.org@localhost
+MAINTAINER= mdehling%gmail.com@localhost
HOMEPAGE= https://luajit.org/
COMMENT= Just-In-Time Compiler for the Lua programming language
LICENSE= mit
-CONFLICTS+= LuaJIT2-[0-9]*
+CONFLICTS+= LuaJIT2-[0-9]* LuaJIT-git-[0-9]*
USE_TOOLS+= gmake
-NOT_PAX_MPROTECT_SAFE+= bin/luajit-${PKGVERSION}
+ONLY_FOR_PLATFORM+= *-*-aarch64*
+ONLY_FOR_PLATFORM+= *-*-*arm* # ARMv5+, ARM9E+
+ONLY_FOR_PLATFORM+= *-*-i386 # req SSE2
+ONLY_FOR_PLATFORM+= *-*-mips*
+ONLY_FOR_PLATFORM+= *-*-powerpc
+ONLY_FOR_PLATFORM+= *-*-x86_64
-# Address pkg/47587 lua not linked to pthread causes issues with modules
+# pkg/47587: lua not linked to pthread causes issues with modules
PTHREAD_OPTS+= native
PTHREAD_AUTO_VARS= yes
.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "Darwin" && ${OS_VERSION:R} >= 19
-CFLAGS.Darwin+= -fno-stack-check
-MAKE_ARGS+= XCFLAGS=-DLUAJIT_ENABLE_GC64
-.endif
-
-
# Upstream doesn't support building shared libs on SunOS
# http://www.freelists.org/post/luajit/LuaJIT-on-solaris-64
PLIST_VARS+= shared
diff --git a/LuaJIT21/PLIST b/LuaJIT21/PLIST
index 3617bd4e90..cd74ca1639 100644
--- a/LuaJIT21/PLIST
+++ b/LuaJIT21/PLIST
@@ -10,25 +10,27 @@ include/luajit-2.1/lualib.h
lib/libluajit-5.1.a
${PLIST.shared}lib/libluajit-5.1.so
${PLIST.shared}lib/libluajit-5.1.so.2
-${PLIST.shared}lib/libluajit-5.1.so.2.1.0
+${PLIST.shared}lib/libluajit-5.1.so.${PKGVERSION}
lib/pkgconfig/luajit.pc
-share/luajit-${PKGVERSION}/jit/bc.lua
-share/luajit-${PKGVERSION}/jit/bcsave.lua
-share/luajit-${PKGVERSION}/jit/dis_arm.lua
-share/luajit-${PKGVERSION}/jit/dis_arm64.lua
-share/luajit-${PKGVERSION}/jit/dis_arm64be.lua
-share/luajit-${PKGVERSION}/jit/dis_mips.lua
-share/luajit-${PKGVERSION}/jit/dis_mips64.lua
-share/luajit-${PKGVERSION}/jit/dis_mips64el.lua
-share/luajit-${PKGVERSION}/jit/dis_mipsel.lua
-share/luajit-${PKGVERSION}/jit/dis_ppc.lua
-share/luajit-${PKGVERSION}/jit/dis_x64.lua
-share/luajit-${PKGVERSION}/jit/dis_x86.lua
-share/luajit-${PKGVERSION}/jit/dump.lua
-share/luajit-${PKGVERSION}/jit/p.lua
-share/luajit-${PKGVERSION}/jit/v.lua
-share/luajit-${PKGVERSION}/jit/vmdef.lua
-share/luajit-${PKGVERSION}/jit/zone.lua
man/man1/luajit.1
+share/luajit-2.1/jit/bc.lua
+share/luajit-2.1/jit/bcsave.lua
+share/luajit-2.1/jit/dis_arm.lua
+share/luajit-2.1/jit/dis_arm64.lua
+share/luajit-2.1/jit/dis_arm64be.lua
+share/luajit-2.1/jit/dis_mips.lua
+share/luajit-2.1/jit/dis_mips64.lua
+share/luajit-2.1/jit/dis_mips64el.lua
+share/luajit-2.1/jit/dis_mips64r6.lua
+share/luajit-2.1/jit/dis_mips64r6el.lua
+share/luajit-2.1/jit/dis_mipsel.lua
+share/luajit-2.1/jit/dis_ppc.lua
+share/luajit-2.1/jit/dis_x64.lua
+share/luajit-2.1/jit/dis_x86.lua
+share/luajit-2.1/jit/dump.lua
+share/luajit-2.1/jit/p.lua
+share/luajit-2.1/jit/v.lua
+share/luajit-2.1/jit/vmdef.lua
+share/luajit-2.1/jit/zone.lua
@pkgdir share/lua/5.1
@pkgdir lib/lua/5.1
diff --git a/LuaJIT21/buildlink3.mk b/LuaJIT21/buildlink3.mk
index 0c62b61c01..2349226f33 100644
--- a/LuaJIT21/buildlink3.mk
+++ b/LuaJIT21/buildlink3.mk
@@ -1,14 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.1 2014/03/26 13:29:53 imil Exp $
+# $NetBSD$
BUILDLINK_TREE+= LuaJIT21
.if !defined(LUAJIT21_BUILDLINK3_MK)
LUAJIT21_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.LuaJIT21+= LuaJIT21>=2.1.0beta3
+BUILDLINK_API_DEPENDS.LuaJIT21+= LuaJIT21>=2.1
BUILDLINK_PKGSRCDIR.LuaJIT21?= ../../wip/LuaJIT21
-
-BUILDLINK_CFLAGS.LuaJIT21+= -I${BUILDLINK_PREFIX.LuaJIT21}/include/luajit-2.1
+BUILDLINK_INCDIRS.LuaJIT21+= include/luajit-2.1
.endif # LUAJIT21_BUILDLINK3_MK
BUILDLINK_TREE+= -LuaJIT21
diff --git a/LuaJIT21/distinfo b/LuaJIT21/distinfo
index cb768de591..309fb7add8 100644
--- a/LuaJIT21/distinfo
+++ b/LuaJIT21/distinfo
@@ -1,7 +1,7 @@
$NetBSD: distinfo,v 1.9 2017/05/29 21:47:31 alnsn Exp $
-RMD160 (LuaJIT-2.1.0-beta3.tar.gz) = 5f41b0b6e3bfe1f1e033f7464171d474ca497235
-SHA512 (LuaJIT-2.1.0-beta3.tar.gz) = c44e967a0f671ed32b55aee810bc8b3b63737a2d7363b8984ae1949b24f98dbb3f9be7c1e10239fdeb96a3e3c836f606342cbd61838cf9bcadb077443eb5bc12
-Size (LuaJIT-2.1.0-beta3.tar.gz) = 1025180 bytes
-SHA1 (patch-Makefile) = 63f9c3c2848b1570c4f8f30d377ae567fc5cf6b5
-SHA1 (patch-src_Makefile) = d7236260dc17f470d7d6e41a57a22dcd3a501c28
+BLAKE2s (LuaJIT-2.1.1710088188-d06beb0480c5d1eb53b3343e78063950275aa281.tar.gz) = 921ee2e79d970ec8dcdf2cf20f6410d0aeadaa5d18ba2c1d9b31e091fd0f044b
+SHA512 (LuaJIT-2.1.1710088188-d06beb0480c5d1eb53b3343e78063950275aa281.tar.gz) = 335194490404a6ea2e77dd9f92deacb75024d961b69e0a8597814dfb9e7df5fe46a8489eafa9697f7547879464f0723b05a265e3388277ed59344b3269be5e20
+Size (LuaJIT-2.1.1710088188-d06beb0480c5d1eb53b3343e78063950275aa281.tar.gz) = 1081883 bytes
+SHA1 (patch-Makefile) = 95218d5d1cffe5149eef6308486a189874667485
+SHA1 (patch-src_Makefile) = 68f9ce9e42070b0f24ddf35ced92c22746d8d206
diff --git a/LuaJIT21/patches/patch-Makefile b/LuaJIT21/patches/patch-Makefile
index 7e49bdc09c..460dbed86a 100644
--- a/LuaJIT21/patches/patch-Makefile
+++ b/LuaJIT21/patches/patch-Makefile
@@ -1,19 +1,10 @@
-$NetBSD: patch-Makefile,v 1.6 2017/05/29 21:47:31 alnsn Exp $
+$NetBSD$
-Fix installation.
+fix install paths
---- Makefile.orig 2017-05-01 19:05:00.000000000 +0000
+--- Makefile.orig 2024-03-10 16:29:48.000000000 +0000
+++ Makefile
-@@ -16,7 +16,7 @@
- MAJVER= 2
- MINVER= 1
- RELVER= 0
--PREREL= -beta3
-+PREREL= beta3
- VERSION= $(MAJVER).$(MINVER).$(RELVER)$(PREREL)
- ABIVER= 5.1
-
-@@ -25,7 +25,6 @@ ABIVER= 5.1
+@@ -30,7 +30,6 @@ VERSION= $(MMVERSION).$(RELVER)
# Change the installation path as needed. This automatically adjusts
# the paths in src/luaconf.h, too. Note: PREFIX must be an absolute path!
#
@@ -21,36 +12,12 @@ Fix installation.
export MULTILIB= lib
##############################################################################
-@@ -41,7 +40,7 @@ INSTALL_LMODD= $(INSTALL_SHARE)/lua
+@@ -47,7 +46,7 @@ INSTALL_LMODD= $(INSTALL_SHARE)/lua
INSTALL_LMOD= $(INSTALL_LMODD)/$(ABIVER)
INSTALL_CMODD= $(INSTALL_LIB)/lua
INSTALL_CMOD= $(INSTALL_CMODD)/$(ABIVER)
-INSTALL_MAN= $(INSTALL_SHARE)/man/man1
-+INSTALL_MAN= $(DPREFIX)/${PKGMANDIR}/man1
++INSTALL_MAN= $(DPREFIX)/$(PKGMANDIR)/man1
INSTALL_PKGCONFIG= $(INSTALL_LIB)/pkgconfig
INSTALL_TNAME= luajit-$(VERSION)
-@@ -75,7 +74,7 @@ SYMLINK= ln -sf
- INSTALL_X= install -m 0755
- INSTALL_F= install -m 0644
- UNINSTALL= $(RM)
--LDCONFIG= ldconfig -n
-+LDCONFIG= true
- SED_PC= sed -e "s|^prefix=.*|prefix=$(PREFIX)|" \
- -e "s|^multilib=.*|multilib=$(MULTILIB)|"
-
-@@ -130,13 +129,8 @@ install: $(INSTALL_DEP)
- $(RM) $(FILE_PC).tmp
- cd src && $(INSTALL_F) $(FILES_INC) $(INSTALL_INC)
- cd src/jit && $(INSTALL_F) $(FILES_JITLIB) $(INSTALL_JITLIB)
-+ $(SYMLINK) $(INSTALL_TNAME) $(INSTALL_TSYM)
- @echo "==== Successfully installed LuaJIT $(VERSION) to $(PREFIX) ===="
-- @echo ""
-- @echo "Note: the development releases deliberately do NOT install a symlink for luajit"
-- @echo "You can do this now by running this command (with sudo):"
-- @echo ""
-- @echo " $(SYMLINK) $(INSTALL_TNAME) $(INSTALL_TSYM)"
-- @echo ""
-
-
- uninstall:
diff --git a/LuaJIT21/patches/patch-src_Makefile b/LuaJIT21/patches/patch-src_Makefile
index 85dfba636c..2dc6f1daea 100644
--- a/LuaJIT21/patches/patch-src_Makefile
+++ b/LuaJIT21/patches/patch-src_Makefile
@@ -1,16 +1,16 @@
-$NetBSD: patch-src_Makefile,v 1.2 2017/05/29 21:47:31 alnsn Exp $
+$NetBSD$
-Fix building on OS X.
+fix building on darwin
---- src/Makefile.orig 2017-05-01 18:11:00.000000000 +0000
+--- src/Makefile.orig 2024-04-04 18:11:30.456080960 +0000
+++ src/Makefile
-@@ -297,9 +297,6 @@ ifeq (,$(shell $(TARGET_CC) -o /dev/null
+@@ -315,9 +315,6 @@ ifeq (,$(shell $(TARGET_CC) -o /dev/null
TARGET_XCFLAGS+= -fno-stack-protector
endif
ifeq (Darwin,$(TARGET_SYS))
- ifeq (,$(MACOSX_DEPLOYMENT_TARGET))
-- export MACOSX_DEPLOYMENT_TARGET=10.4
+- $(error missing: export MACOSX_DEPLOYMENT_TARGET=XX.YY)
- endif
TARGET_STRIP+= -x
+ TARGET_XCFLAGS+= -DLUAJIT_UNWIND_EXTERNAL
TARGET_XSHLDFLAGS= -dynamiclib -single_module -undefined dynamic_lookup -fPIC
- TARGET_DYNXLDOPTS=
diff --git a/LuaJIT21/platform.mk b/LuaJIT21/platform.mk
new file mode 100644
index 0000000000..34d4c47cf7
--- /dev/null
+++ b/LuaJIT21/platform.mk
@@ -0,0 +1,18 @@
+# $NetBSD$
+
+.include "../../mk/bsd.fast.prefs.mk"
+
+.if !defined(PLATFORM_SUPPORTS_LUAJIT)
+
+. for luajit_arch in aarch64* *arm* i386 mips* powerpc x86_64
+LUAJIT_PLATFORMS+= *-*-${luajit_arch}
+. endfor
+
+. for luajit_platform in ${LUAJIT_PLATFORMS}
+. if !empty(MACHINE_PLATFORM:M${luajit_platform})
+PLATFORM_SUPPORTS_LUAJIT= yes
+. endif
+. endfor
+PLATFORM_SUPPORTS_LUAJIT?= no
+
+.endif # !defined(PLATFORM_SUPPORTS_LUAJIT)
Home |
Main Index |
Thread Index |
Old Index