mirrors/cgit
0
0
Fork 0
mirror of https://git.zx2c4.com/cgit synced 2024-11-22 08:28:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

makefile: use LUA_PKGCONFIG to set Lua implementation

Browse Source 
This breaks compat with the previous LUA_IMPLEMENTATION but gives more
flexibility in that user can specify the pkg-config package name
directly.

Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
This commit is contained in:
Natanael Copa 2014-01-22 13:15:08 +01:00 committed by Jason A. Donenfeld
parent f759cc0f08
commit 44ccae4227
2 changed files with 16 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
README
View File

@ -38,14 +38,11 @@ If you'd like to compile without Lua support, you may use:
And if you'd like to specify a Lua implementation, you may use: And if you'd like to specify a Lua implementation, you may use:
$ make LUA_IMPLEMENTATION=JIT $ make LUA_PKGCONFIG=lua5.1
for using the LuaJIT project. Or: If this is not specified, the Lua implementation will be auto-detected,
preferring LuaJIT if many are present. Acceptable values are generally "lua",
$ make LUA_IMPLEMENTATION=VANILLA "luajit", "lua5.1", and "lua5.2".
for the mainline Lua project. If you specify neither implementation, it will
be auto-detected, preferring LuaJIT if both are present.
Dependencies Dependencies

34
cgit.mk
View File

@ -29,30 +29,18 @@ ifdef NO_LUA
LUA_MESSAGE := linking without specified Lua support LUA_MESSAGE := linking without specified Lua support
CGIT_CFLAGS += -DNO_LUA CGIT_CFLAGS += -DNO_LUA
else else
LUAJIT_CFLAGS := $(shell pkg-config --cflags luajit 2>/dev/null) ifeq ($(LUA_PKGCONFIG),)
LUAJIT_LIBS := $(shell pkg-config --libs luajit 2>/dev/null) LUA_PKGCONFIG := $(shell for pc in luajit lua lua5.2 lua5.1; do \
LUA_LIBS := $(shell pkg-config --libs lua 2>/dev/null) pkg-config --exists $$pc && echo $$pc && break; \
LUA_CFLAGS := $(shell pkg-config --cflags lua 2>/dev/null) done)
ifeq (JIT,$(LUA_IMPLEMENTATION)) LUA_MODE := autodetected
ifeq ($(strip $(LUAJIT_LIBS)),) else
$(error LuaJIT specified via LUA_IMPLEMENTATION=JIT, but library could not be found.) LUA_MODE := specified
endif endif
LUA_MESSAGE := linking with selected LuaJIT ifneq ($(LUA_PKGCONFIG),)
CGIT_LIBS += $(LUAJIT_LIBS) LUA_MESSAGE := linking with $(LUA_MODE) $(LUA_PKGCONFIG)
CGIT_CFLAGS += $(LUAJIT_CFLAGS) LUA_LIBS := $(shell pkg-config --libs $(LUA_PKGCONFIG) 2>/dev/null)
else ifeq (VANILLA,$(LUA_IMPLEMENTATION)) LUA_CFLAGS := $(shell pkg-config --cflags $(LUA_PKGCONFIG) 2>/dev/null)
ifeq ($(strip $(LUA_LIBS)),)
$(error Lua specified via LUA_IMPLEMENTATION=VANILLA, but library could not be found.)
endif
LUA_MESSAGE := linking with selected Lua
CGIT_LIBS += $(LUA_LIBS)
CGIT_LIBS += $(LUA_CFLAGS)
else ifneq ($(strip $(LUAJIT_LIBS)),)
LUA_MESSAGE := linking with autodetected LuaJIT
CGIT_LIBS += $(LUAJIT_LIBS)
CGIT_CFLAGS += $(LUAJIT_CFLAGS)
else ifneq ($(strip $(LUA_LIBS)),)
LUA_MESSAGE := linking with autodetected Lua
CGIT_LIBS += $(LUA_LIBS) CGIT_LIBS += $(LUA_LIBS)
CGIT_CFLAGS += $(LUA_CFLAGS) CGIT_CFLAGS += $(LUA_CFLAGS)
else else