mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-25 05:48:07 -05:00
gnu: lua: Add patch to generate pkg-config file.
* gnu/packages/patches/lua-pkgconfig.patch: New file. * gnu/packages/lua.scm (lua)[source]: Add patch. * gnu-system.am (dist_patch_DATA): Register patch. Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Siniša Biđin
Ludovic Courtès
parent
25ae74cffa
commit
6edb5b7765
3 changed files with 112 additions and 1 deletions
|
|
@ -549,6 +549,7 @@ dist_patch_DATA = \
|
|||
gnu/packages/patches/libwmf-CVE-2015-0848+4588+4695+4696.patch \
|
||||
gnu/packages/patches/lirc-localstatedir.patch \
|
||||
gnu/packages/patches/lm-sensors-hwmon-attrs.patch \
|
||||
gnu/packages/patches/lua-pkgconfig.patch \
|
||||
gnu/packages/patches/lua51-liblua-so.patch \
|
||||
gnu/packages/patches/luajit-no_ldconfig.patch \
|
||||
gnu/packages/patches/luajit-symlinks.patch \
|
||||
|
|
|
|||
|
|
@ -36,7 +36,8 @@ (define-public lua
|
|||
(uri (string-append "http://www.lua.org/ftp/lua-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "0b8034v1s82n4dg5rzcn12067ha3nxaylp2vdp8gg08kjsbzphhk"))))
|
||||
(base32 "0b8034v1s82n4dg5rzcn12067ha3nxaylp2vdp8gg08kjsbzphhk"))
|
||||
(patches (list (search-patch "lua-pkgconfig.patch")))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs `(("readline", readline)))
|
||||
(arguments
|
||||
|
|
|
|||
109
gnu/packages/patches/lua-pkgconfig.patch
Normal file
109
gnu/packages/patches/lua-pkgconfig.patch
Normal file
|
|
@ -0,0 +1,109 @@
|
|||
Enables generating Lua's pkg-config file.
|
||||
|
||||
http://lua-users.org/lists/lua-l/2015-03/msg00338.html
|
||||
|
||||
--- a/Makefile 2014-10-30 00:14:41.000000000 +0100
|
||||
+++ b/Makefile 2015-03-26 18:54:37.678374827 +0100
|
||||
@@ -14,6 +14,7 @@
|
||||
INSTALL_BIN= $(INSTALL_TOP)/bin
|
||||
INSTALL_INC= $(INSTALL_TOP)/include
|
||||
INSTALL_LIB= $(INSTALL_TOP)/lib
|
||||
+INSTALL_PC= $(INSTALL_LIB)/pkgconfig
|
||||
INSTALL_MAN= $(INSTALL_TOP)/man/man1
|
||||
INSTALL_LMOD= $(INSTALL_TOP)/share/lua/$V
|
||||
INSTALL_CMOD= $(INSTALL_TOP)/lib/lua/$V
|
||||
@@ -39,9 +40,12 @@
|
||||
PLATS= aix bsd c89 freebsd generic linux macosx mingw posix solaris
|
||||
|
||||
# What to install.
|
||||
-TO_BIN= lua luac
|
||||
+INTERPRETER= lua
|
||||
+COMPILER= luac
|
||||
+TO_BIN= $(INTERPRETER) $(COMPILER)
|
||||
TO_INC= lua.h luaconf.h lualib.h lauxlib.h lua.hpp
|
||||
TO_LIB= liblua.a
|
||||
+TO_PC= lua-$(V).pc
|
||||
TO_MAN= lua.1 luac.1
|
||||
|
||||
# Lua version and release.
|
||||
@@ -51,23 +55,29 @@
|
||||
# Targets start here.
|
||||
all: $(PLAT)
|
||||
|
||||
-$(PLATS) clean:
|
||||
+$(PLATS):
|
||||
cd src && $(MAKE) $@
|
||||
|
||||
+clean:
|
||||
+ cd src && $(MAKE) $@
|
||||
+ $(RM) $(TO_PC)
|
||||
+
|
||||
test: dummy
|
||||
src/lua -v
|
||||
|
||||
-install: dummy
|
||||
- cd src && $(MKDIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD)
|
||||
+install: dummy $(TO_PC)
|
||||
+ cd src && $(MKDIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_PC) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD)
|
||||
cd src && $(INSTALL_EXEC) $(TO_BIN) $(INSTALL_BIN)
|
||||
cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC)
|
||||
cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB)
|
||||
+ cd src && $(INSTALL_DATA) ../$(TO_PC) $(INSTALL_PC)
|
||||
cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN)
|
||||
|
||||
uninstall:
|
||||
cd src && cd $(INSTALL_BIN) && $(RM) $(TO_BIN)
|
||||
cd src && cd $(INSTALL_INC) && $(RM) $(TO_INC)
|
||||
cd src && cd $(INSTALL_LIB) && $(RM) $(TO_LIB)
|
||||
+ cd src && cd $(INSTALL_PC) && $(RM) $(TO_PC)
|
||||
cd doc && cd $(INSTALL_MAN) && $(RM) $(TO_MAN)
|
||||
|
||||
local:
|
||||
@@ -90,11 +100,13 @@
|
||||
@echo "TO_BIN= $(TO_BIN)"
|
||||
@echo "TO_INC= $(TO_INC)"
|
||||
@echo "TO_LIB= $(TO_LIB)"
|
||||
+ @echo "TO_PC= $(TO_PC)"
|
||||
@echo "TO_MAN= $(TO_MAN)"
|
||||
@echo "INSTALL_TOP= $(INSTALL_TOP)"
|
||||
@echo "INSTALL_BIN= $(INSTALL_BIN)"
|
||||
@echo "INSTALL_INC= $(INSTALL_INC)"
|
||||
@echo "INSTALL_LIB= $(INSTALL_LIB)"
|
||||
+ @echo "INSTALL_PC= $(INSTALL_PC)"
|
||||
@echo "INSTALL_MAN= $(INSTALL_MAN)"
|
||||
@echo "INSTALL_LMOD= $(INSTALL_LMOD)"
|
||||
@echo "INSTALL_CMOD= $(INSTALL_CMOD)"
|
||||
@@ -103,12 +115,28 @@
|
||||
|
||||
# echo pkg-config data
|
||||
pc:
|
||||
- @echo "version=$R"
|
||||
- @echo "prefix=$(INSTALL_TOP)"
|
||||
- @echo "libdir=$(INSTALL_LIB)"
|
||||
- @echo "includedir=$(INSTALL_INC)"
|
||||
+ @echo 'prefix=$(INSTALL_TOP)'
|
||||
+ @echo 'libdir=$(INSTALL_LIB)'
|
||||
+ @echo 'includedir=$(INSTALL_INC)'
|
||||
+ @echo 'bindir=$(INSTALL_BIN)'
|
||||
+ @echo
|
||||
+ @echo 'INSTALL_LMOD=$(INSTALL_LMOD)'
|
||||
+ @echo 'INSTALL_CMOD=$(INSTALL_CMOD)'
|
||||
+ @echo 'INTERPRETER=$${bindir}/$(INTERPRETER)'
|
||||
+ @echo 'COMPILER=$${bindir}/$(COMPILER)'
|
||||
+ @echo
|
||||
+ @echo 'Name: Lua'
|
||||
+ @echo 'Description: A powerful, fast, lightweight, embeddable scripting language'
|
||||
+ @echo 'Version: $(R)'
|
||||
+ @echo
|
||||
+ @echo 'Libs: -L$${libdir} -llua -lm'
|
||||
+ @echo 'Cflags: -I$${includedir}'
|
||||
+
|
||||
+pkg-config: $(TO_PC)
|
||||
+$(TO_PC):
|
||||
+ @$(MAKE) -s pc > $@
|
||||
|
||||
# list targets that do not create files (but not all makes understand .PHONY)
|
||||
-.PHONY: all $(PLATS) clean test install local none dummy echo pecho lecho
|
||||
+.PHONY: all $(PLATS) clean test install local none dummy echo pecho lecho pkg-config
|
||||
|
||||
# (end of Makefile)
|
||||
Loading…
Reference in a new issue