From 6dbf1fec0d56152a9a893045cd508d337349e02a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 31 Oct 2016 13:02:59 +0000 Subject: gnu: lua: Update to 5.3.3. * gnu/packages/patches/lua52-liblua-so.patch: Rename to ... * gnu/packages/patches/lua-liblua-so.patch: ... this. Add version comment. * gnu/local.mk (dist_patch_DATA): Adjust patch name. * gnu/packages/lua.scm (lua): Update to 5.3.3. [source]: Use https URL. Use new patch name. [home-page]: Use https URL. (lua-5.2): New variable. (lua-5.1)[source]: Use https URL. --- gnu/packages/lua.scm | 25 +++++++--- gnu/packages/patches/lua-liblua-so.patch | 80 ++++++++++++++++++++++++++++++ gnu/packages/patches/lua52-liblua-so.patch | 78 ----------------------------- 3 files changed, 99 insertions(+), 84 deletions(-) create mode 100644 gnu/packages/patches/lua-liblua-so.patch delete mode 100644 gnu/packages/patches/lua52-liblua-so.patch (limited to 'gnu/packages') diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index 8fdba61e92..fe0ec208aa 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -40,15 +40,15 @@ (define-public lua (package (name "lua") - (version "5.2.4") + (version "5.3.3") (source (origin (method url-fetch) - (uri (string-append "http://www.lua.org/ftp/lua-" + (uri (string-append "https://www.lua.org/ftp/lua-" version ".tar.gz")) (sha256 - (base32 "0jwznq0l8qg9wh5grwg07b5cy3lzngvl5m2nl1ikp6vqssmf9qmr")) + (base32 "18mcfbbmjyp8f2l9yy7n6dzk066nq6man0kpwly4bppphilc04si")) (patches (search-patches "lua-pkgconfig.patch" - "lua52-liblua-so.patch")))) + "lua-liblua-so.patch")))) (build-system gnu-build-system) (inputs `(("readline" ,readline))) (arguments @@ -69,7 +69,7 @@ (string-append "INSTALL_TOP=" out) (string-append "INSTALL_MAN=" out "/share/man/man1"))))))))) - (home-page "http://www.lua.org/") + (home-page "https://www.lua.org/") (synopsis "Embeddable scripting language") (description "Lua is a powerful, fast, lightweight, embeddable scripting language. Lua @@ -80,12 +80,25 @@ automatic memory management with incremental garbage collection, making it ideal for configuration, scripting, and rapid prototyping.") (license license:x11))) +(define-public lua-5.2 + (package (inherit lua) + (version "5.2.4") + (source + (origin + (method url-fetch) + (uri (string-append "https://www.lua.org/ftp/lua-" + version ".tar.gz")) + (sha256 + (base32 "0jwznq0l8qg9wh5grwg07b5cy3lzngvl5m2nl1ikp6vqssmf9qmr")) + (patches (search-patches "lua-pkgconfig.patch" + "lua-liblua-so.patch")))))) + (define-public lua-5.1 (package (inherit lua) (version "5.1.5") (source (origin (method url-fetch) - (uri (string-append "http://www.lua.org/ftp/lua-" + (uri (string-append "https://www.lua.org/ftp/lua-" version ".tar.gz")) (sha256 (base32 "0cskd4w0g6rdm2q8q3i4n1h3j8kylhs3rq8mxwl9vwlmlxbgqh16")) diff --git a/gnu/packages/patches/lua-liblua-so.patch b/gnu/packages/patches/lua-liblua-so.patch new file mode 100644 index 0000000000..0fad8dc90b --- /dev/null +++ b/gnu/packages/patches/lua-liblua-so.patch @@ -0,0 +1,80 @@ +This applies to Lua 5.2 and 5.3. + +From 7a1b4e0829124976878ca2765a8e546667a92ceb Mon Sep 17 00:00:00 2001 +From: Leo Famulari +Date: Fri, 30 Oct 2015 19:11:31 -0400 +Subject: [PATCH] apply existing non-executable library patch and install + libraries as executable + +--- + Makefile | 6 +++--- + src/Makefile | 8 +++++++- + 2 files changed, 10 insertions(+), 4 deletions(-) + +diff --git a/Makefile b/Makefile +index 1aea8e6..bfcfed9 100644 +--- a/Makefile ++++ b/Makefile +@@ -44,7 +44,7 @@ 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_LIB= liblua.a liblua.so liblua.so.${V} + TO_PC= lua-$(V).pc + TO_MAN= lua.1 luac.1 + +@@ -56,7 +56,7 @@ R= $V.3 + all: $(PLAT) + + $(PLATS): +- cd src && $(MAKE) $@ ++ cd src && $(MAKE) $@ V=$(V) R=$(R) + + clean: + cd src && $(MAKE) $@ +@@ -69,7 +69,7 @@ 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_EXEC) $(TO_LIB) $(INSTALL_LIB) + cd src && $(INSTALL_DATA) ../$(TO_PC) $(INSTALL_PC) + cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN) + +diff --git a/src/Makefile b/src/Makefile +index 7b4b2b7..c86476e 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -29,6 +29,7 @@ MYOBJS= + PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris + + LUA_A= liblua.a ++LUA_SO= liblua.so + CORE_O= lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \ + lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o \ + ltm.o lundump.o lvm.o lzio.o +@@ -43,7 +44,7 @@ LUAC_T= luac + LUAC_O= luac.o + + ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O) +-ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) ++ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) $(LUA_SO) + ALL_A= $(LUA_A) + + # Targets start here. +@@ -55,6 +56,11 @@ o: $(ALL_O) + + a: $(ALL_A) + ++$(LUA_SO): $(CORE_O) $(LIB_O) ++ $(CC) -shared -ldl -Wl,-soname,$(LUA_SO).$(V) -o $@.$(R) $? -lm $(MYLDFLAGS) ++ ln -sf $(LUA_SO).$(R) $(LUA_SO).$(V) ++ ln -sf $(LUA_SO).$(R) $(LUA_SO) ++ + $(LUA_A): $(BASE_O) + $(AR) $@ $(BASE_O) + $(RANLIB) $@ +-- +2.6.1 + diff --git a/gnu/packages/patches/lua52-liblua-so.patch b/gnu/packages/patches/lua52-liblua-so.patch deleted file mode 100644 index 2e6b39ae79..0000000000 --- a/gnu/packages/patches/lua52-liblua-so.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 7a1b4e0829124976878ca2765a8e546667a92ceb Mon Sep 17 00:00:00 2001 -From: Leo Famulari -Date: Fri, 30 Oct 2015 19:11:31 -0400 -Subject: [PATCH] apply existing non-executable library patch and install - libraries as executable - ---- - Makefile | 6 +++--- - src/Makefile | 8 +++++++- - 2 files changed, 10 insertions(+), 4 deletions(-) - -diff --git a/Makefile b/Makefile -index 1aea8e6..bfcfed9 100644 ---- a/Makefile -+++ b/Makefile -@@ -44,7 +44,7 @@ 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_LIB= liblua.a liblua.so liblua.so.${V} - TO_PC= lua-$(V).pc - TO_MAN= lua.1 luac.1 - -@@ -56,7 +56,7 @@ R= $V.3 - all: $(PLAT) - - $(PLATS): -- cd src && $(MAKE) $@ -+ cd src && $(MAKE) $@ V=$(V) R=$(R) - - clean: - cd src && $(MAKE) $@ -@@ -69,7 +69,7 @@ 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_EXEC) $(TO_LIB) $(INSTALL_LIB) - cd src && $(INSTALL_DATA) ../$(TO_PC) $(INSTALL_PC) - cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN) - -diff --git a/src/Makefile b/src/Makefile -index 7b4b2b7..c86476e 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -29,6 +29,7 @@ MYOBJS= - PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris - - LUA_A= liblua.a -+LUA_SO= liblua.so - CORE_O= lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \ - lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o \ - ltm.o lundump.o lvm.o lzio.o -@@ -43,7 +44,7 @@ LUAC_T= luac - LUAC_O= luac.o - - ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O) --ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) -+ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) $(LUA_SO) - ALL_A= $(LUA_A) - - # Targets start here. -@@ -55,6 +56,11 @@ o: $(ALL_O) - - a: $(ALL_A) - -+$(LUA_SO): $(CORE_O) $(LIB_O) -+ $(CC) -shared -ldl -Wl,-soname,$(LUA_SO).$(V) -o $@.$(R) $? -lm $(MYLDFLAGS) -+ ln -sf $(LUA_SO).$(R) $(LUA_SO).$(V) -+ ln -sf $(LUA_SO).$(R) $(LUA_SO) -+ - $(LUA_A): $(BASE_O) - $(AR) $@ $(BASE_O) - $(RANLIB) $@ --- -2.6.1 - -- cgit 1.4.1