Re: [PATCH] gnu: lua-5.1: install pkg-config file.

[Efraim Flashner]

On Tue, Sep 06, 2016 at 02:40:46PM +0200, Danny Milosavljevic wrote:
> Hi,
> 
> it works for me (and has been adapted from the newer lua's patch where it 
> also worked) and it's necessary for celestia.
> 
> No idea why it's still pending...

Patch pushed!

-- 
Efraim Flashner  אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted


signature.asc
Description: PGP signature

Re: [PATCH] gnu: lua-5.1: install pkg-config file.

[Danny Milosavljevic]

Hi,

it works for me (and has been adapted from the newer lua's patch where it also 
worked) and it's necessary for celestia.

No idea why it's still pending...

Re: [PATCH] gnu: lua-5.1: install pkg-config file.

[Efraim Flashner]

On Tue, Aug 16, 2016 at 08:05:12PM +0200, Danny Milosavljevic wrote:
> gnu: lua-5.1: install pkg-config file.
> 
> * gnu/packages/lua.scm (lua-5.1): Modified.
> * gnu/packages/patches/lua51-pkgconfig.patch: New file.
> ---
>  gnu/local.mk   |   1 +
>  gnu/packages/lua.scm   |   3 +-
>  gnu/packages/patches/lua51-pkgconfig.patch | 101 
> +
>  3 files changed, 104 insertions(+), 1 deletion(-)
>  create mode 100644 gnu/packages/patches/lua51-pkgconfig.patch
> 

> diff --git a/gnu/local.mk b/gnu/local.mk
> index 7416850..8d2f754 100644
> --- a/gnu/local.mk
> +++ b/gnu/local.mk
> @@ -648,6 +648,7 @@ dist_patch_DATA = 
> \
>%D%/packages/patches/lua-CVE-2014-5461.patch  \
>%D%/packages/patches/lua-pkgconfig.patch  \
>%D%/packages/patches/lua51-liblua-so.patch\
> +  %D%/packages/patches/lua51-pkgconfig.patch\
>%D%/packages/patches/lua52-liblua-so.patch\
>%D%/packages/patches/luajit-no_ldconfig.patch  \
>%D%/packages/patches/luajit-symlinks.patch \
> diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm
> index b4b5dee..9f72c7c 100644
> --- a/gnu/packages/lua.scm
> +++ b/gnu/packages/lua.scm
> @@ -80,7 +80,8 @@ for configuration, scripting, and rapid prototyping.")
>   (sha256
>(base32 
> "0cskd4w0g6rdm2q8q3i4n1h3j8kylhs3rq8mxwl9vwlmlxbgqh16"))
>   (patches (search-patches "lua51-liblua-so.patch"
> -  "lua-CVE-2014-5461.patch"))
> +  "lua-CVE-2014-5461.patch"
> +  "lua51-pkgconfig.patch"))
>  
>  (define-public luajit
>(package
> diff --git a/gnu/packages/patches/lua51-pkgconfig.patch 
> b/gnu/packages/patches/lua51-pkgconfig.patch
> new file mode 100644
> index 000..5b03ada
> --- /dev/null
> +++ b/gnu/packages/patches/lua51-pkgconfig.patch
> @@ -0,0 +1,101 @@
> +Enables generating Lua's pkg-config file.
> +
> +http://lua-users.org/lists/lua-l/2015-03/msg00338.html
> +
> +--- a/Makefile   2016-08-16 19:44:27.363614964 +0200
>  b/Makefile   2016-08-16 19:49:22.623070005 +0200
> +@@ -13,6 +13,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
> + #
> + # You probably want to make INSTALL_LMOD and INSTALL_CMOD consistent with
> +@@ -41,9 +42,12 @@
> + PLATS= aix ansi bsd 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 ../etc/lua.hpp
> + TO_LIB= liblua.a liblua.so liblua.so.${V}
> ++TO_PC= lua-$(V).pc
> + TO_MAN= lua.1 luac.1
> + 
> + # Lua version and release.
> +@@ -52,17 +56,22 @@
> + 
> + all:$(PLAT)
> + 
> +-$(PLATS) clean:
> ++$(PLATS):
> + cd src && $(MAKE) $@ V=$(V) R=$(R)
> + 
> ++clean:
> ++cd src && $(MAKE) $@
> ++$(RM) $(TO_PC)
> ++
> + test:   dummy
> + src/lua test/hello.lua
> + 
> +-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)
> + 
> + ranlib:
> +@@ -95,6 +104,7 @@
> + @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)"
> +@@ -111,6 +121,7 @@
> + @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 config parameters as Lua code
> +@@ -122,7 +133,29 @@
> + @$(MAKE) echo | grep = | sed -e 's/= /= "/' -e 's/$$/"/' #-e 's/""/nil/'
> + @echo "-- EOF"
> + 
> ++pc:
> ++@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)'
> ++@ech

[PATCH] gnu: lua-5.1: install pkg-config file.

[Danny Milosavljevic]

gnu: lua-5.1: install pkg-config file.

* gnu/packages/lua.scm (lua-5.1): Modified.
* gnu/packages/patches/lua51-pkgconfig.patch: New file.
---
 gnu/local.mk   |   1 +
 gnu/packages/lua.scm   |   3 +-
 gnu/packages/patches/lua51-pkgconfig.patch | 101 +
 3 files changed, 104 insertions(+), 1 deletion(-)
 create mode 100644 gnu/packages/patches/lua51-pkgconfig.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 7416850..8d2f754 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -648,6 +648,7 @@ dist_patch_DATA =		\
   %D%/packages/patches/lua-CVE-2014-5461.patch  \
   %D%/packages/patches/lua-pkgconfig.patch  \
   %D%/packages/patches/lua51-liblua-so.patch\
+  %D%/packages/patches/lua51-pkgconfig.patch\
   %D%/packages/patches/lua52-liblua-so.patch\
   %D%/packages/patches/luajit-no_ldconfig.patch			\
   %D%/packages/patches/luajit-symlinks.patch			\
diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm
index b4b5dee..9f72c7c 100644
--- a/gnu/packages/lua.scm
+++ b/gnu/packages/lua.scm
@@ -80,7 +80,8 @@ for configuration, scripting, and rapid prototyping.")
  (sha256
   (base32 "0cskd4w0g6rdm2q8q3i4n1h3j8kylhs3rq8mxwl9vwlmlxbgqh16"))
  (patches (search-patches "lua51-liblua-so.patch"
-  "lua-CVE-2014-5461.patch"))
+  "lua-CVE-2014-5461.patch"
+  "lua51-pkgconfig.patch"))
 
 (define-public luajit
   (package
diff --git a/gnu/packages/patches/lua51-pkgconfig.patch b/gnu/packages/patches/lua51-pkgconfig.patch
new file mode 100644
index 000..5b03ada
--- /dev/null
+++ b/gnu/packages/patches/lua51-pkgconfig.patch
@@ -0,0 +1,101 @@
+Enables generating Lua's pkg-config file.
+
+http://lua-users.org/lists/lua-l/2015-03/msg00338.html
+
+--- a/Makefile	2016-08-16 19:44:27.363614964 +0200
 b/Makefile	2016-08-16 19:49:22.623070005 +0200
+@@ -13,6 +13,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
+ #
+ # You probably want to make INSTALL_LMOD and INSTALL_CMOD consistent with
+@@ -41,9 +42,12 @@
+ PLATS= aix ansi bsd 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 ../etc/lua.hpp
+ TO_LIB= liblua.a liblua.so liblua.so.${V}
++TO_PC= lua-$(V).pc
+ TO_MAN= lua.1 luac.1
+ 
+ # Lua version and release.
+@@ -52,17 +56,22 @@
+ 
+ all:	$(PLAT)
+ 
+-$(PLATS) clean:
++$(PLATS):
+ 	cd src && $(MAKE) $@ V=$(V) R=$(R)
+ 
++clean:
++	cd src && $(MAKE) $@
++	$(RM) $(TO_PC)
++
+ test:	dummy
+ 	src/lua test/hello.lua
+ 
+-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)
+ 
+ ranlib:
+@@ -95,6 +104,7 @@
+ 	@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)"
+@@ -111,6 +121,7 @@
+ 	@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 config parameters as Lua code
+@@ -122,7 +133,29 @@
+ 	@$(MAKE) echo | grep = | sed -e 's/= /= "/' -e 's/$$/"/' #-e 's/""/nil/'
+ 	@echo "-- EOF"
+ 
++pc:
++	@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 dum