mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-13 07:10:05 +02:00
652984e2bd
luajit has switched to a rolling release model using the Unix timestamp of the latest commit as the version number
91 lines
2.8 KiB
Plaintext
91 lines
2.8 KiB
Plaintext
From f54e1c17085bfdc0d9934c49b14954ed45d2f6e7 Mon Sep 17 00:00:00 2001
|
|
From: Christof Meerwald <cmeerw@cmeerw.org>
|
|
Date: Thu, 21 Dec 2023 20:00:27 +0100
|
|
Subject: adjust search path for Haiku
|
|
|
|
|
|
diff --git a/src/luaconf.h b/src/luaconf.h
|
|
index f47f0680..c7c58d37 100644
|
|
--- a/src/luaconf.h
|
|
+++ b/src/luaconf.h
|
|
@@ -35,13 +35,19 @@
|
|
#ifndef LUA_LMULTILIB
|
|
#define LUA_LMULTILIB "lib"
|
|
#endif
|
|
+#ifdef __HAIKU__
|
|
+#define LUA_DATA "data"
|
|
+#define LUA_LROOT LUA_ROOT "/non-packaged"
|
|
+#else
|
|
+#define LUA_DATA "share"
|
|
#define LUA_LROOT "/usr/local"
|
|
+#endif
|
|
#define LUA_LUADIR "/lua/5.1/"
|
|
#define LUA_LJDIR "/luajit-2.1/"
|
|
|
|
#ifdef LUA_ROOT
|
|
#define LUA_JROOT LUA_ROOT
|
|
-#define LUA_RLDIR LUA_ROOT "/share" LUA_LUADIR
|
|
+#define LUA_RLDIR LUA_ROOT "/" LUA_DATA LUA_LUADIR
|
|
#define LUA_RCDIR LUA_ROOT "/" LUA_MULTILIB LUA_LUADIR
|
|
#define LUA_RLPATH ";" LUA_RLDIR "?.lua;" LUA_RLDIR "?/init.lua"
|
|
#define LUA_RCPATH ";" LUA_RCDIR "?.so"
|
|
@@ -51,8 +57,8 @@
|
|
#define LUA_RCPATH
|
|
#endif
|
|
|
|
-#define LUA_JPATH ";" LUA_JROOT "/share" LUA_LJDIR "?.lua"
|
|
-#define LUA_LLDIR LUA_LROOT "/share" LUA_LUADIR
|
|
+#define LUA_JPATH ";" LUA_JROOT "/" LUA_DATA LUA_LJDIR "?.lua"
|
|
+#define LUA_LLDIR LUA_LROOT "/" LUA_DATA LUA_LUADIR
|
|
#define LUA_LCDIR LUA_LROOT "/" LUA_LMULTILIB LUA_LUADIR
|
|
#define LUA_LLPATH ";" LUA_LLDIR "?.lua;" LUA_LLDIR "?/init.lua"
|
|
#define LUA_LCPATH1 ";" LUA_LCDIR "?.so"
|
|
--
|
|
2.40.1
|
|
|
|
From 16d7fbeddd2988a9a92f07dd9256b647bf6fbba7 Mon Sep 17 00:00:00 2001
|
|
From: Christof Meerwald <cmeerw@cmeerw.org>
|
|
Date: Thu, 21 Dec 2023 20:59:36 +0100
|
|
Subject: use GIT_RELVER if it is already set
|
|
|
|
|
|
diff --git a/src/Makefile b/src/Makefile
|
|
index 224d21e7..08644c09 100644
|
|
--- a/src/Makefile
|
|
+++ b/src/Makefile
|
|
@@ -475,7 +475,8 @@ DASM_FLAGS= $(DASM_XFLAGS) $(DASM_AFLAGS)
|
|
DASM_DASC= vm_$(DASM_ARCH).dasc
|
|
|
|
GIT= git
|
|
-ifeq (Windows,$(HOST_SYS)$(HOST_MSYS))
|
|
+ifneq ($(GIT_RELVER),)
|
|
+else ifeq (Windows,$(HOST_SYS)$(HOST_MSYS))
|
|
GIT_RELVER= if exist ..\.git ( $(GIT) show -s --format=%%ct >luajit_relver.txt ) else ( type ..\.relver >luajit_relver.txt )
|
|
else
|
|
GIT_RELVER= [ -e ../.git ] && $(GIT) show -s --format=%ct >luajit_relver.txt 2>/dev/null || cat ../.relver >luajit_relver.txt 2>/dev/null || :
|
|
--
|
|
2.40.1
|
|
|
|
From 663d81c7b333b2096f2403ad02e679e25d26ede3 Mon Sep 17 00:00:00 2001
|
|
From: Christof Meerwald <cmeerw@cmeerw.org>
|
|
Date: Sat, 23 Dec 2023 14:11:44 +0100
|
|
Subject: also update INSTALL_LMOD and INSTALL_CMOD in luajit.pc
|
|
|
|
|
|
diff --git a/Makefile b/Makefile
|
|
index 3aed365d..330f5d97 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -88,6 +88,8 @@ SED_PC= sed -e "s|^prefix=.*|prefix=$(PREFIX)|" \
|
|
ifneq ($(INSTALL_DEFINC),$(INSTALL_INC))
|
|
SED_PC+= -e "s|^includedir=.*|includedir=$(INSTALL_INC)|"
|
|
endif
|
|
+SED_PC+= -e "s|^INSTALL_LMOD=.*|INSTALL_LMOD=$(INSTALL_LMOD)|"
|
|
+SED_PC+= -e "s|^INSTALL_CMOD=.*|INSTALL_CMOD=$(INSTALL_CMOD)|"
|
|
|
|
FILE_T= luajit
|
|
FILE_A= libluajit.a
|
|
--
|
|
2.40.1
|
|
|