* [PATCH] gnu: lua: Add patch to generate pkg-config file.
@ 2015-08-21 4:44 Siniša Biđin
2015-08-25 16:51 ` Ludovic Courtès
0 siblings, 1 reply; 4+ messages in thread
From: Siniša Biđin @ 2015-08-21 4:44 UTC (permalink / raw)
To: guix-devel
* gnu/packages/patches/lua-pkgconfig.patch: New file.
* gnu/packages/lua.scm (lua)[source]: Add patch.
* gnu-system.am (dist_patch_DATA): Register patch.
---
gnu-system.am | 1 +
gnu/packages/lua.scm | 13 ++--
gnu/packages/patches/lua-pkgconfig.patch | 107 +++++++++++++++++++++++++++++++
3 files changed, 115 insertions(+), 6 deletions(-)
create mode 100644 gnu/packages/patches/lua-pkgconfig.patch
diff --git a/gnu-system.am b/gnu-system.am
index 688a10f..b43dc5b 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -547,6 +547,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 \
diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm
index 9a3a83f..fcdd13e 100644
--- a/gnu/packages/lua.scm
+++ b/gnu/packages/lua.scm
@@ -31,12 +31,13 @@
(package
(name "lua")
(version "5.2.3")
- (source (origin
- (method url-fetch)
- (uri (string-append "http://www.lua.org/ftp/lua-"
- version ".tar.gz"))
- (sha256
- (base32 "0b8034v1s82n4dg5rzcn12067ha3nxaylp2vdp8gg08kjsbzphhk"))))
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "http://www.lua.org/ftp/lua-" version ".tar.gz"))
+ (sha256
+ (base32 "0b8034v1s82n4dg5rzcn12067ha3nxaylp2vdp8gg08kjsbzphhk"))
+ (patches (list (search-patch "lua-pkgconfig.patch")))))
(build-system gnu-build-system)
(inputs `(("readline", readline)))
(arguments
diff --git a/gnu/packages/patches/lua-pkgconfig.patch b/gnu/packages/patches/lua-pkgconfig.patch
new file mode 100644
index 0000000..85b131c
--- /dev/null
+++ b/gnu/packages/patches/lua-pkgconfig.patch
@@ -0,0 +1,107 @@
+Enables generating the lua.pc pkg-config file.
+
+--- 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)
--
2.4.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] gnu: lua: Add patch to generate pkg-config file.
2015-08-21 4:44 [PATCH] gnu: lua: Add patch to generate pkg-config file Siniša Biđin
@ 2015-08-25 16:51 ` Ludovic Courtès
2015-08-27 19:35 ` Siniša Biđin
0 siblings, 1 reply; 4+ messages in thread
From: Ludovic Courtès @ 2015-08-25 16:51 UTC (permalink / raw)
To: Siniša Biđin; +Cc: guix-devel
Siniša Biđin <sinisa@bidin.eu> skribis:
> * gnu/packages/patches/lua-pkgconfig.patch: New file.
> * gnu/packages/lua.scm (lua)[source]: Add patch.
> * gnu-system.am (dist_patch_DATA): Register patch.
[...]
> +++ b/gnu/packages/patches/lua-pkgconfig.patch
> @@ -0,0 +1,107 @@
> +Enables generating the lua.pc pkg-config file.
Looks good, but could you indicate the upstream status of the change in
the patch? (If it’s upstream, just put the VCS URL for instance; if the
patch was written by you, it’d be good to submit it upstream and paste
the mailing list archive URL instead.)
Could you send an updated path?
Thanks, and sorry for the delay!
Ludo’.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] gnu: lua: Add patch to generate pkg-config file.
2015-08-25 16:51 ` Ludovic Courtès
@ 2015-08-27 19:35 ` Siniša Biđin
2015-08-27 20:57 ` Ludovic Courtès
0 siblings, 1 reply; 4+ messages in thread
From: Siniša Biđin @ 2015-08-27 19:35 UTC (permalink / raw)
To: ludo; +Cc: guix-devel
[-- Attachment #1: Type: text/plain, Size: 615 bytes --]
On 2015-08-25 18:51, ludo@gnu.org wrote:
> Looks good, but could you indicate the upstream status of the change in
> the patch? (If it’s upstream, just put the VCS URL for instance; if
> the
> patch was written by you, it’d be good to submit it upstream and paste
> the mailing list archive URL instead.)
It's neither: it was written by Nicola Fontana and can be found here:
http://lua-users.org/lists/lua-l/2015-03/msg00338.html
I've simply added the URL atop the patch description. Is this okay?
> Could you send an updated path?
Sure, you'll find it attached.
Thanks,
Siniša
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-lua-Add-patch-to-generate-pkg-config-file.patch --]
[-- Type: text/x-diff; name=0001-gnu-lua-Add-patch-to-generate-pkg-config-file.patch, Size: 5530 bytes --]
From 00fa6555c62927efcb0610ef3cd1afa8ed1298f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sini=C5=A1a=20Bi=C4=91in?= <sinisa@bidin.eu>
Date: Thu, 27 Aug 2015 23:13:30 +0200
Subject: [PATCH] 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.
---
gnu-system.am | 1 +
gnu/packages/lua.scm | 3 +-
gnu/packages/patches/lua-pkgconfig.patch | 109 +++++++++++++++++++++++++++++++
3 files changed, 112 insertions(+), 1 deletion(-)
create mode 100644 gnu/packages/patches/lua-pkgconfig.patch
diff --git a/gnu-system.am b/gnu-system.am
index 130ae36..09e2f02 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -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 \
diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm
index 9a3a83f..87f53d1 100644
--- a/gnu/packages/lua.scm
+++ b/gnu/packages/lua.scm
@@ -36,7 +36,8 @@
(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
diff --git a/gnu/packages/patches/lua-pkgconfig.patch b/gnu/packages/patches/lua-pkgconfig.patch
new file mode 100644
index 0000000..449efd9
--- /dev/null
+++ b/gnu/packages/patches/lua-pkgconfig.patch
@@ -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)
--
2.5.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] gnu: lua: Add patch to generate pkg-config file.
2015-08-27 19:35 ` Siniša Biđin
@ 2015-08-27 20:57 ` Ludovic Courtès
0 siblings, 0 replies; 4+ messages in thread
From: Ludovic Courtès @ 2015-08-27 20:57 UTC (permalink / raw)
To: Siniša Biđin; +Cc: guix-devel
Siniša Biđin <sinisa@bidin.eu> skribis:
> On 2015-08-25 18:51, ludo@gnu.org wrote:
>> Looks good, but could you indicate the upstream status of the change in
>> the patch? (If it’s upstream, just put the VCS URL for instance; if
>> the
>> patch was written by you, it’d be good to submit it upstream and paste
>> the mailing list archive URL instead.)
>
> It's neither: it was written by Nicola Fontana and can be found here:
>
> http://lua-users.org/lists/lua-l/2015-03/msg00338.html
>
> I've simply added the URL atop the patch description. Is this okay?
Perfect.
> From 00fa6555c62927efcb0610ef3cd1afa8ed1298f2 Mon Sep 17 00:00:00 2001
> From: =?UTF-8?q?Sini=C5=A1a=20Bi=C4=91in?= <sinisa@bidin.eu>
> Date: Thu, 27 Aug 2015 23:13:30 +0200
> Subject: [PATCH] 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.
Committed, thanks!
Ludo’.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-08-27 20:58 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-08-21 4:44 [PATCH] gnu: lua: Add patch to generate pkg-config file Siniša Biđin
2015-08-25 16:51 ` Ludovic Courtès
2015-08-27 19:35 ` Siniša Biđin
2015-08-27 20:57 ` Ludovic Courtès
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).