12:55 a.m.
Hi again,
This patch is preparation for packaging luxio in nix.
Because nix doesn't use standard fhs dirs we need to be able to
override some values.
While I was doing this I saw an opportunity to make things a bit simpler,
so I've done that.
With these patches I'm able to build luxio for lua5.1 and lua5.2 in nix,
and the build for 5.1 on my debian installation appears to work, though
I've not built any debian packages from this branch.
Hope this helps,
Richard Ipsum
Richard Ipsum (3):
Allow installation dirs to be overridden
Split find lua Make code into separate file
Factor version from find lua lib logic
Makefile | 141 +++++++++----------------------------------------------------
findlua.mk | 73 ++++++++++++++++++++++++++++++++
2 files changed, 93 insertions(+), 121 deletions(-)
create mode 100644 findlua.mk
--
2.12.2.510.ge1104a5.dirty
12:55 a.m.
New subject: [PATCH 1/3] Allow installation dirs to be overridden
---
Makefile | 30 ++++++++++++++++++------------
1 file changed, 18 insertions(+), 12 deletions(-)
diff --git a/Makefile b/Makefile
index 33edf49..9a5657b 100644
--- a/Makefile
+++ b/Makefile
@@ -126,13 +126,17 @@ luxio_constants.inc: luxio_constants.inc.in const-proc.lua
lua-5.1: luxio-5.1.so luxio-5.1
ln -s -f luxio-5.1.so luxio.so
+LUA_BINDIR ?= $(DESTDIR)$(PREFIX)/bin
+
+lua-5.1-install: INST_LIBDIR ?= $(LUA51_CMOD_INST)
+lua-5.1-install: INST_LUADIR ?= $(LUA51_LMOD_INST)
lua-5.1-install: lua-5.1
- $(INSTALL) -d $(DESTDIR)$(LUA51_CMOD_INST)
- $(INSTALL) -m 755 luxio-5.1.so $(DESTDIR)$(LUA51_CMOD_INST)/luxio.so
- $(INSTALL) -d $(DESTDIR)$(LUA51_LMOD_INST)/luxio
- $(INSTALL) -m 644 $(LUALIBS) $(DESTDIR)$(LUA51_LMOD_INST)/luxio/
- $(INSTALL) -d $(DESTDIR)$(PREFIX)/bin
- $(INSTALL) luxio-5.1 $(DESTDIR)$(PREFIX)/bin/luxio-5.1
+ $(INSTALL) -d $(INST_LIBDIR)
+ $(INSTALL) -m 755 luxio-5.1.so $(INST_LIBDIR)/luxio.so
+ $(INSTALL) -d $(DESTDIR)$(INST_LUADIR)/luxio
+ $(INSTALL) -m 644 $(LUALIBS) $(INST_LUADIR)/luxio/
+ $(INSTALL) -d $(LUA_BINDIR)
+ $(INSTALL) luxio-5.1 $(LUA_BINDIR)/luxio-5.1
luxio-5.1.so: luxio-5.1.o
$(CC) $(LDFLAGS) -shared $(EXTRA_LIBS) -o luxio-5.1.so $^ $(LUA51_LIB)
@@ -143,13 +147,15 @@ luxio-5.1: lua-5.1.c luxio-5.1.o
lua-5.2: luxio-5.2.so luxio-5.2
ln -s -f luxio-5.2.so luxio.so
+lua-5.2-install: INST_LIBDIR ?= $(LUA52_CMOD_INST)
+lua-5.2-install: INST_LUADIR ?= $(LUA52_LMOD_INST)
lua-5.2-install: lua-5.2
- $(INSTALL) -d $(DESTDIR)$(LUA52_CMOD_INST)
- $(INSTALL) -m 755 luxio-5.2.so $(DESTDIR)$(LUA52_CMOD_INST)/luxio.so
- $(INSTALL) -d $(DESTDIR)$(LUA52_LMOD_INST)/luxio
- $(INSTALL) -m 644 $(LUALIBS) $(DESTDIR)$(LUA52_LMOD_INST)/luxio/
- $(INSTALL) -d $(DESTDIR)$(PREFIX)/bin
- $(INSTALL) luxio-5.2 $(DESTDIR)$(PREFIX)/bin/luxio-5.2
+ $(INSTALL) -d $(INST_LIBDIR)
+ $(INSTALL) -m 755 luxio-5.2.so $(INST_LIBDIR)/luxio.so
+ $(INSTALL) -d $(DESTDIR)$(INST_LUADIR)/luxio
+ $(INSTALL) -m 644 $(LUALIBS) $(INST_LUADIR)/luxio/
+ $(INSTALL) -d $(LUA_BINDIR)
+ $(INSTALL) luxio-5.2 $(LUA_BINDIR)/luxio-5.2
luxio-5.2.so: luxio-5.2.o
$(CC) $(LDFLAGS) -shared $(EXTRA_LIBS) -o luxio-5.2.so $^ $(LUA52_LIB)
--
2.12.2.510.ge1104a5.dirty
9:50 p.m.
New subject: [PATCH 1/3] Allow installation dirs to be overridden
On Fri, Apr 14, 2017 at 23:55:41 +0100, Richard Ipsum wrote:
+ $(INSTALL) -d $(INST_LIBDIR)
+ $(INSTALL) -m 755 luxio-5.1.so $(INST_LIBDIR)/luxio.so
+ $(INSTALL) -d $(DESTDIR)$(INST_LUADIR)/luxio
+ $(INSTALL) -m 644 $(LUALIBS) $(INST_LUADIR)/luxio/
+ $(INSTALL) -d $(LUA_BINDIR)
+ $(INSTALL) luxio-5.1 $(LUA_BINDIR)/luxio-5.1
Targets on here seem to be missing DESTDIR.
+ $(INSTALL) -d $(INST_LIBDIR)
+ $(INSTALL) -m 755 luxio-5.2.so $(INST_LIBDIR)/luxio.so
+ $(INSTALL) -d $(DESTDIR)$(INST_LUADIR)/luxio
+ $(INSTALL) -m 644 $(LUALIBS) $(INST_LUADIR)/luxio/
+ $(INSTALL) -d $(LUA_BINDIR)
+ $(INSTALL) luxio-5.2 $(LUA_BINDIR)/luxio-5.2
Ditto.
D.
--
Daniel Silverstone http://www.digital-scurf.org/
PGP mail accepted and encouraged. Key Id: 3CCE BABE 206C 3B69
10:15 p.m.
New subject: [PATCH 1/3] Allow installation dirs to be overridden
On Wed, Apr 26, 2017 at 08:50:15PM +0100, Daniel Silverstone wrote:
On Fri, Apr 14, 2017 at 23:55:41 +0100, Richard Ipsum wrote:
> + $(INSTALL) -d $(INST_LIBDIR)
> + $(INSTALL) -m 755 luxio-5.1.so $(INST_LIBDIR)/luxio.so
> + $(INSTALL) -d $(DESTDIR)$(INST_LUADIR)/luxio
> + $(INSTALL) -m 644 $(LUALIBS) $(INST_LUADIR)/luxio/
> + $(INSTALL) -d $(LUA_BINDIR)
> + $(INSTALL) luxio-5.1 $(LUA_BINDIR)/luxio-5.1
Targets on here seem to be missing DESTDIR.
ack
12:55 a.m.
New subject: [PATCH 2/3] Split find lua Make code into separate file
---
Makefile | 111 ++-----------------------------------------------------------
findlua.mk | 107 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 109 insertions(+), 109 deletions(-)
create mode 100644 findlua.mk
diff --git a/Makefile b/Makefile
index 9a5657b..aaf34aa 100644
--- a/Makefile
+++ b/Makefile
@@ -1,122 +1,15 @@
+include findlua.mk
+
all: lua-5.1-try lua-5.2-try
install: lua-5.1-try-install lua-5.2-try-install
-ifeq ($(strip $(shell which pkg-config > /dev/null || echo NONE)),NONE)
- $(error This makefile requires pkg-config)
-endif
-
-ifeq ($(strip $(shell which $(CC) > /dev/null || echo NONE)),NONE)
- $(info Luxio: Hmm, CC make variable contains nonsense. Overriding to gcc.)
- CC := gcc
-endif
-
-# This isn't nice. Find a nice way.
-HOST_OS := $(shell uname -s)
-
-ifneq ($(findstring $(HOST_OS),Linux NetBSD GNU/kFreeBSD),)
- # These operating systems require a seperate Real Time library
- EXTRA_LIBS := -lrt
-else
- EXTRA_LIBS :=
-endif
-
-NAKED_LUA_VER := $(shell (pkg-config --exists lua && \
- pkg-config --modversion lua || \
- pkg-config --variable V lua) | cut -d. -f1-2)
-
-# fine appropriate Lua interpreter
-LUA_REPL := $(shell (which lua5.1 > /dev/null 2>&1 && echo lua5.1) ||
\
- (which lua-5.1 > /dev/null 2>&1 && echo lua-5.1) ||
\
- (which lua51 > /dev/null 2>&1 && echo lua51) || \
- (lua -e"print(_VERSION)" | grep -q 5.1 && echo lua)
|| \
- (which lua-5.2 > /dev/null 2>&1 && echo lua-5.2) ||
\
- (which lua52 > /dev/null 2>&1 && echo lua52))
-
-# find appropriate Lua libraries
-LUA51_PKG := $(shell (pkg-config --exists lua5.1 && echo lua5.1) || \
- (pkg-config --exists lua-5.1 && echo lua-5.1) || \
- (pkg-config --exists lua51 && echo lua51) || \
- (echo "NONE"))
-
-
-LUA51_PKG := $(strip $(LUA51_PKG))
-
-ifeq ($(LUA51_PKG),NONE)
- ifeq ($(NAKED_LUA_VER),5.1)
- LUA51_PKG := lua
- endif
-endif
-
-ifneq ($(LUA51_PKG),NONE)
- $(info Luxio: Lua 5.1 package name on this system is $(LUA51_PKG))
- LUA51_HAS_MODINST := $(shell test x`pkg-config --variable INSTALL_LMOD $(LUA51_PKG)` !=
x && echo YES)
- LUA51_INC := $(shell pkg-config --cflags $(LUA51_PKG))
- LUA51_LIB := $(shell pkg-config --libs $(LUA51_PKG))
- ifeq ($(LUA51_HAS_MODINST),)
- LOCAL := YES
- endif
- ifeq ($(LOCAL),)
- LUA51_LMOD_INST := $(shell pkg-config --variable=INSTALL_LMOD $(LUA51_PKG))
- LUA51_CMOD_INST := $(shell pkg-config --variable=INSTALL_CMOD $(LUA51_PKG))
- else
- LUA51_LMOD_INST := /usr/local/share/lua/5.1
- LUA51_CMOD_INST := /usr/local/lib/lua/5.1
- endif
- lua-5.1-try: lua-5.1
- lua-5.1-try-install: lua-5.1-install
-else
-lua-5.1-try:
- @echo Luxio: Lua 5.1 could not be found, so luxio was not built for it.
-lua-5.1-try-install:
- @echo Luxio: Lua 5.1 could not be found, so luxio was not installed for it.
-endif
-
-LUA52_PKG := $(shell (pkg-config --exists lua5.2 && echo lua5.2) || \
- (pkg-config --exists lua-5.2 && echo lua-5.2) || \
- (pkg-config --exists lua52 && echo lua52) || \
- (echo "NONE"))
-
-LUA52_PKG := $(strip $(LUA52_PKG))
-
-ifeq ($(LUA52_PKG),NONE)
- ifeq ($(NAKED_LUA_VER),5.2)
- LUA52_PKG := lua
- endif
-endif
-
-ifneq ($(LUA52_PKG),NONE)
- $(info Luxio: Lua 5.2 package name on this system is $(LUA52_PKG))
- LUA52_HAS_MODINST := $(shell test x`pkg-config --variable INSTALL_LMOD $(LUA52_PKG)` !=
x && echo YES)
- LUA52_INC := $(shell pkg-config --cflags $(LUA52_PKG))
- LUA52_LIB := $(shell pkg-config --libs $(LUA52_PKG))
- ifeq ($(LUA52_HAS_MODINST),)
- LOCAL := YES
- endif
- ifeq ($(LOCAL),)
- LUA52_LMOD_INST := $(shell pkg-config --variable=INSTALL_LMOD $(LUA52_PKG))
- LUA52_CMOD_INST := $(shell pkg-config --variable=INSTALL_CMOD $(LUA52_PKG))
- else
- LUA52_LMOD_INST := /usr/local/share/lua/5.2
- LUA52_CMOD_INST := /usr/local/lib/lua/5.2
- endif
- lua-5.2-try: lua-5.2
- lua-5.2-try-install: lua-5.2-install
-else
-lua-5.2-try:
- @echo Luxio: Lua 5.2 could not be found, so luxio was not built for it.
-lua-5.2-try-install:
- @echo Luxio: Lua 5.2 could not be found, so luxio was not installed for it.
-endif
-
-
CFLAGS ?= -O2 -Wall
INSTALL := /usr/bin/install
LUALIBS := $(patsubst %,luxio/%.lua, \
event simple subprocess)
-
clean:
$(RM) *.so *.o luxio_constants.inc luxio-5.1 luxio-5.2
diff --git a/findlua.mk b/findlua.mk
new file mode 100644
index 0000000..b8149fb
--- /dev/null
+++ b/findlua.mk
@@ -0,0 +1,107 @@
+ifeq ($(strip $(shell which pkg-config > /dev/null || echo NONE)),NONE)
+ $(error This makefile requires pkg-config)
+endif
+
+ifeq ($(strip $(shell which $(CC) > /dev/null || echo NONE)),NONE)
+ $(info Luxio: Hmm, CC make variable contains nonsense. Overriding to gcc.)
+ CC := gcc
+endif
+
+# This isn't nice. Find a nice way.
+HOST_OS := $(shell uname -s)
+
+ifneq ($(findstring $(HOST_OS),Linux NetBSD GNU/kFreeBSD),)
+ # These operating systems require a seperate Real Time library
+ EXTRA_LIBS := -lrt
+else
+ EXTRA_LIBS :=
+endif
+
+NAKED_LUA_VER := $(shell (pkg-config --exists lua && \
+ pkg-config --modversion lua || \
+ pkg-config --variable V lua) | cut -d. -f1-2)
+
+# fine appropriate Lua interpreter
+LUA_REPL := $(shell (which lua5.1 > /dev/null 2>&1 && echo lua5.1) ||
\
+ (which lua-5.1 > /dev/null 2>&1 && echo lua-5.1) ||
\
+ (which lua51 > /dev/null 2>&1 && echo lua51) || \
+ (lua -e"print(_VERSION)" | grep -q 5.1 && echo lua)
|| \
+ (which lua-5.2 > /dev/null 2>&1 && echo lua-5.2) ||
\
+ (which lua52 > /dev/null 2>&1 && echo lua52))
+
+# find appropriate Lua libraries
+LUA51_PKG := $(shell (pkg-config --exists lua5.1 && echo lua5.1) || \
+ (pkg-config --exists lua-5.1 && echo lua-5.1) || \
+ (pkg-config --exists lua51 && echo lua51) || \
+ (echo "NONE"))
+
+
+LUA51_PKG := $(strip $(LUA51_PKG))
+
+ifeq ($(LUA51_PKG),NONE)
+ ifeq ($(NAKED_LUA_VER),5.1)
+ LUA51_PKG := lua
+ endif
+endif
+
+ifneq ($(LUA51_PKG),NONE)
+ $(info Luxio: Lua 5.1 package name on this system is $(LUA51_PKG))
+ LUA51_HAS_MODINST := $(shell test x`pkg-config --variable INSTALL_LMOD $(LUA51_PKG)` !=
x && echo YES)
+ LUA51_INC := $(shell pkg-config --cflags $(LUA51_PKG))
+ LUA51_LIB := $(shell pkg-config --libs $(LUA51_PKG))
+ ifeq ($(LUA51_HAS_MODINST),)
+ LOCAL := YES
+ endif
+ ifeq ($(LOCAL),)
+ LUA51_LMOD_INST := $(shell pkg-config --variable=INSTALL_LMOD $(LUA51_PKG))
+ LUA51_CMOD_INST := $(shell pkg-config --variable=INSTALL_CMOD $(LUA51_PKG))
+ else
+ LUA51_LMOD_INST := /usr/local/share/lua/5.1
+ LUA51_CMOD_INST := /usr/local/lib/lua/5.1
+ endif
+ lua-5.1-try: lua-5.1
+ lua-5.1-try-install: lua-5.1-install
+else
+lua-5.1-try:
+ @echo Luxio: Lua 5.1 could not be found, so luxio was not built for it.
+lua-5.1-try-install:
+ @echo Luxio: Lua 5.1 could not be found, so luxio was not installed for it.
+endif
+
+LUA52_PKG := $(shell (pkg-config --exists lua5.2 && echo lua5.2) || \
+ (pkg-config --exists lua-5.2 && echo lua-5.2) || \
+ (pkg-config --exists lua52 && echo lua52) || \
+ (echo "NONE"))
+
+LUA52_PKG := $(strip $(LUA52_PKG))
+
+ifeq ($(LUA52_PKG),NONE)
+ ifeq ($(NAKED_LUA_VER),5.2)
+ LUA52_PKG := lua
+ endif
+endif
+
+ifneq ($(LUA52_PKG),NONE)
+ $(info Luxio: Lua 5.2 package name on this system is $(LUA52_PKG))
+ LUA52_HAS_MODINST := $(shell test x`pkg-config --variable INSTALL_LMOD $(LUA52_PKG)` !=
x && echo YES)
+ LUA52_INC := $(shell pkg-config --cflags $(LUA52_PKG))
+ LUA52_LIB := $(shell pkg-config --libs $(LUA52_PKG))
+ ifeq ($(LUA52_HAS_MODINST),)
+ LOCAL := YES
+ endif
+ ifeq ($(LOCAL),)
+ LUA52_LMOD_INST := $(shell pkg-config --variable=INSTALL_LMOD $(LUA52_PKG))
+ LUA52_CMOD_INST := $(shell pkg-config --variable=INSTALL_CMOD $(LUA52_PKG))
+ else
+ LUA52_LMOD_INST := /usr/local/share/lua/5.2
+ LUA52_CMOD_INST := /usr/local/lib/lua/5.2
+ endif
+ lua-5.2-try: lua-5.2
+ lua-5.2-try-install: lua-5.2-install
+else
+lua-5.2-try:
+ @echo Luxio: Lua 5.2 could not be found, so luxio was not built for it.
+lua-5.2-try-install:
+ @echo Luxio: Lua 5.2 could not be found, so luxio was not installed for it.
+endif
+
--
2.12.2.510.ge1104a5.dirty
12:55 a.m.
New subject: [PATCH 3/3] Factor version from find lua lib logic
---
findlua.mk | 92 ++++++++++++++++++++------------------------------------------
1 file changed, 29 insertions(+), 63 deletions(-)
diff --git a/findlua.mk b/findlua.mk
index b8149fb..dc94a39 100644
--- a/findlua.mk
+++ b/findlua.mk
@@ -19,7 +19,7 @@ endif
NAKED_LUA_VER := $(shell (pkg-config --exists lua && \
pkg-config --modversion lua || \
- pkg-config --variable V lua) | cut -d. -f1-2)
+ pkg-config --variable V lua) | cut -d. -f1-2)
# fine appropriate Lua interpreter
LUA_REPL := $(shell (which lua5.1 > /dev/null 2>&1 && echo lua5.1) ||
\
@@ -30,78 +30,44 @@ LUA_REPL := $(shell (which lua5.1 > /dev/null 2>&1
&& echo lua5.1) || \
(which lua52 > /dev/null 2>&1 && echo lua52))
# find appropriate Lua libraries
-LUA51_PKG := $(shell (pkg-config --exists lua5.1 && echo lua5.1) || \
- (pkg-config --exists lua-5.1 && echo lua-5.1) || \
- (pkg-config --exists lua51 && echo lua51) || \
+define find_lua_libs
+LUA$(1)_PKG := $$(shell (pkg-config --exists lua$(2) && echo lua$(2)) || \
+ (pkg-config --exists lua-$(2) && echo lua-$(2)) || \
+ (pkg-config --exists lua$(1) && echo lua$(1)) || \
(echo "NONE"))
+LUA$(1)_PKG := $$(strip $$(LUA$(1)_PKG))
-LUA51_PKG := $(strip $(LUA51_PKG))
-
-ifeq ($(LUA51_PKG),NONE)
- ifeq ($(NAKED_LUA_VER),5.1)
- LUA51_PKG := lua
- endif
-endif
-
-ifneq ($(LUA51_PKG),NONE)
- $(info Luxio: Lua 5.1 package name on this system is $(LUA51_PKG))
- LUA51_HAS_MODINST := $(shell test x`pkg-config --variable INSTALL_LMOD $(LUA51_PKG)` !=
x && echo YES)
- LUA51_INC := $(shell pkg-config --cflags $(LUA51_PKG))
- LUA51_LIB := $(shell pkg-config --libs $(LUA51_PKG))
- ifeq ($(LUA51_HAS_MODINST),)
- LOCAL := YES
- endif
- ifeq ($(LOCAL),)
- LUA51_LMOD_INST := $(shell pkg-config --variable=INSTALL_LMOD $(LUA51_PKG))
- LUA51_CMOD_INST := $(shell pkg-config --variable=INSTALL_CMOD $(LUA51_PKG))
- else
- LUA51_LMOD_INST := /usr/local/share/lua/5.1
- LUA51_CMOD_INST := /usr/local/lib/lua/5.1
- endif
- lua-5.1-try: lua-5.1
- lua-5.1-try-install: lua-5.1-install
-else
-lua-5.1-try:
- @echo Luxio: Lua 5.1 could not be found, so luxio was not built for it.
-lua-5.1-try-install:
- @echo Luxio: Lua 5.1 could not be found, so luxio was not installed for it.
-endif
-
-LUA52_PKG := $(shell (pkg-config --exists lua5.2 && echo lua5.2) || \
- (pkg-config --exists lua-5.2 && echo lua-5.2) || \
- (pkg-config --exists lua52 && echo lua52) || \
- (echo "NONE"))
-
-LUA52_PKG := $(strip $(LUA52_PKG))
-
-ifeq ($(LUA52_PKG),NONE)
- ifeq ($(NAKED_LUA_VER),5.2)
- LUA52_PKG := lua
+ifeq ($$(LUA$(1)_PKG),NONE)
+ ifeq ($$(NAKED_LUA_VER),$(2))
+ LUA$(1)_PKG := lua
endif
endif
-ifneq ($(LUA52_PKG),NONE)
- $(info Luxio: Lua 5.2 package name on this system is $(LUA52_PKG))
- LUA52_HAS_MODINST := $(shell test x`pkg-config --variable INSTALL_LMOD $(LUA52_PKG)` !=
x && echo YES)
- LUA52_INC := $(shell pkg-config --cflags $(LUA52_PKG))
- LUA52_LIB := $(shell pkg-config --libs $(LUA52_PKG))
- ifeq ($(LUA52_HAS_MODINST),)
+ifneq ($$(LUA$(1)_PKG),NONE)
+ $$(info Luxio: Lua $(2) package name on this system is $$(LUA$(1)_PKG))
+ LUA$(1)_HAS_MODINST := $$(shell test x`pkg-config --variable INSTALL_LMOD
$$(LUA$(1)_PKG)` != x && echo YES)
+ LUA$(1)_INC := $$(shell pkg-config --cflags $$(LUA$(1)_PKG))
+ LUA$(1)_LIB := $$(shell pkg-config --libs $$(LUA$(1)_PKG))
+ ifeq ($$(LUA$(1)_HAS_MODINST),)
LOCAL := YES
endif
- ifeq ($(LOCAL),)
- LUA52_LMOD_INST := $(shell pkg-config --variable=INSTALL_LMOD $(LUA52_PKG))
- LUA52_CMOD_INST := $(shell pkg-config --variable=INSTALL_CMOD $(LUA52_PKG))
+ ifeq ($$(LOCAL),)
+ LUA$(1)_LMOD_INST := $$(shell pkg-config --variable=INSTALL_LMOD $$(LUA$(1)_PKG))
+ LUA$(1)_CMOD_INST := $$(shell pkg-config --variable=INSTALL_CMOD $$(LUA$(1)_PKG))
else
- LUA52_LMOD_INST := /usr/local/share/lua/5.2
- LUA52_CMOD_INST := /usr/local/lib/lua/5.2
+ LUA$(1)_LMOD_INST := /usr/local/share/lua/$(2)
+ LUA$(1)_CMOD_INST := /usr/local/lib/lua/$(2)
endif
- lua-5.2-try: lua-5.2
- lua-5.2-try-install: lua-5.2-install
+ lua-$(2)-try: lua-$(2)
+ lua-$(2)-try-install: lua-$(2)-install
else
-lua-5.2-try:
- @echo Luxio: Lua 5.2 could not be found, so luxio was not built for it.
-lua-5.2-try-install:
- @echo Luxio: Lua 5.2 could not be found, so luxio was not installed for it.
+lua-$(2)-try:
+ @echo Luxio: Lua $(2) could not be found, so luxio was not built for it.
+lua-$(2)-try-install:
+ @echo Luxio: Lua $(2) could not be found, so luxio was not installed for it.
endif
+endef
+$(eval $(call find_lua_libs,51,5.1))
+$(eval $(call find_lua_libs,52,5.2))
--
2.12.2.510.ge1104a5.dirty
9:51 p.m.
On Fri, Apr 14, 2017 at 23:55:40 +0100, Richard Ipsum wrote:
While I was doing this I saw an opportunity to make things a bit
simpler,
so I've done that.
The patch to adjust the install rules seems to miss entirely the use of DESTDIR
unless I am very mistaken. Could you check that and fix it up if I'm right?
Either way, could you please provide a git repo for me to pull from, along with
a SHA1 to check against, because I'm having difficulty persuading patch series
out of my mail client right now.
Thanks,
Daniel.
--
Daniel Silverstone http://www.digital-scurf.org/
PGP mail accepted and encouraged. Key Id: 3CCE BABE 206C 3B69
10:16 p.m.
On Wed, Apr 26, 2017 at 08:51:36PM +0100, Daniel Silverstone wrote:
On Fri, Apr 14, 2017 at 23:55:40 +0100, Richard Ipsum wrote:
> While I was doing this I saw an opportunity to make things a bit simpler,
> so I've done that.
The patch to adjust the install rules seems to miss entirely the use of DESTDIR
unless I am very mistaken. Could you check that and fix it up if I'm right?
Shall do
Either way, could you please provide a git repo for me to pull from, along with
a SHA1 to check against, because I'm having difficulty persuading patch series
out of my mail client right now.
Ah, sure
Thanks,
Richard
2420
days inactive
2432
days old
7 comments
2 participants
participants (2)
-
Daniel Silverstone -
Richard Ipsum