From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id oDWyBGR33WGhWAAAgWs5BA (envelope-from ) for ; Tue, 11 Jan 2022 13:26:12 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id cB9MAWR33WFPxgAAauVa8A (envelope-from ) for ; Tue, 11 Jan 2022 13:26:12 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 58C3FE366 for ; Tue, 11 Jan 2022 13:26:11 +0100 (CET) Received: from localhost ([::1]:40074 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n7GE6-0001yV-F7 for larch@yhetil.org; Tue, 11 Jan 2022 07:26:10 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41908) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n7GE0-0001wv-Lw for guix-patches@gnu.org; Tue, 11 Jan 2022 07:26:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:33193) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n7GDy-0007JF-RX for guix-patches@gnu.org; Tue, 11 Jan 2022 07:26:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n7GDy-0008Gz-KC for guix-patches@gnu.org; Tue, 11 Jan 2022 07:26:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53186] [PATCH] gnu: lua: add lua version 5.4.3 Resent-From: Alex Devaure Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 11 Jan 2022 12:26:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 53186 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53186@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.164190390631718 (code B ref -1); Tue, 11 Jan 2022 12:26:02 +0000 Received: (at submit) by debbugs.gnu.org; 11 Jan 2022 12:25:06 +0000 Received: from localhost ([127.0.0.1]:54328 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n7GD3-0008FW-JM for submit@debbugs.gnu.org; Tue, 11 Jan 2022 07:25:06 -0500 Received: from lists.gnu.org ([209.51.188.17]:41056) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n7GCz-0008F0-LJ for submit@debbugs.gnu.org; Tue, 11 Jan 2022 07:25:04 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41708) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n7GCz-0001O0-Gb for guix-patches@gnu.org; Tue, 11 Jan 2022 07:25:01 -0500 Received: from [2a00:1450:4864:20::430] (port=38543 helo=mail-wr1-x430.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n7GCt-00072S-VT for guix-patches@gnu.org; Tue, 11 Jan 2022 07:25:01 -0500 Received: by mail-wr1-x430.google.com with SMTP id a5so28679826wrh.5 for ; Tue, 11 Jan 2022 04:24:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=user-agent:from:to:subject:date:message-id:mime-version; bh=oiBr/qS8/yvUrSgbIReuGehXd/BP0qXQMUjVASRKoEg=; b=B6RyT/0AS7MsU3AIoJUFauOHc4Y39HwWGA3LXAMgfyZck08A/SOMYXM58n83fkezw/ seFQjA0vIGvoHKa0wGKQOZtiafJ+tnh4RvW26Qw6GPcMu0A4XlJPo0ZqifTHwxMmxO/+ l+cEtQOFZ3oEO0WmvNcwmsoHexvkGJ3at4nQImvpFbQ49an0qua2wYjJoCv6C6rpGWYo VIKcD1EUPvfagkiQ0fwUOpus+d//nICTEtZ2Lty9jEox2TxRPlcZ0XQNHgXXOAHQOetS MV2gUv6sKL8xbtv51ocmcGyGcTNc5Ux2LYPqD2/bjNQOcjcz74FKvhdw1lToE1KEtr56 HQfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:user-agent:from:to:subject:date:message-id :mime-version; bh=oiBr/qS8/yvUrSgbIReuGehXd/BP0qXQMUjVASRKoEg=; b=zEFoeMvUJekQjpMxNSgyMThWF07CsMDfWCM6QA+Sh4YquMgz9jHO7GRtpFtBS8qX5w d0Ozhd83l/5+nqpVQ3GdPQHV9tqzUVScV5vFR+XqROvpjuAQCLIEclCiyxrSUHYWXkMp Eatp544M9EH4VrpqOty3jpPUvlrT+9UfIYvSepWQpPgsuMJoqcZYKrpRw5S3yhOLse9Q 4kqSRTcdelOmw121jMHW2tTWJUzJSgBLkRLF0Z0tOCFBkO3/Joy3XPu4NCNQ40Do4omc aQ7SKK54BH3ov7JgdPMwgJ+X1TFUlcGAkyNNdGsweE8/fy8Lx0I5r3tal+7g52BZaYq2 12ug== X-Gm-Message-State: AOAM530j1A6990YYVR9UnJYWXBM0/i/HJ5TMMaLtQbsNEze6KIRF0N0T 6fDGBLKF+VZ3h34f8Ctj9cCrt0rQK4E= X-Google-Smtp-Source: ABdhPJxjaN3TEvrT6TEGIlz1eeewqAC4sYM52ARORpTQiqyw+heJL2W4YPa56BDKKSUGmi1luLFQgg== X-Received: by 2002:adf:e291:: with SMTP id v17mr3586301wri.479.1641903894072; Tue, 11 Jan 2022 04:24:54 -0800 (PST) Received: from guixbox ([2a02:c7e:1d62:c300:bcea:534c:4d58:d50]) by smtp.gmail.com with ESMTPSA id h19sm1776184wmq.20.2022.01.11.04.24.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Jan 2022 04:24:53 -0800 (PST) User-agent: mu4e 1.6.10; emacs 27.2 From: Alex Devaure Date: Tue, 11 Jan 2022 12:21:13 +0000 Message-ID: <87h7aapii6.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::430 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=ajadevaure@gmail.com; helo=mail-wr1-x430.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1641903971; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:list-id:list-help:list-unsubscribe:list-subscribe: list-post:dkim-signature; bh=oiBr/qS8/yvUrSgbIReuGehXd/BP0qXQMUjVASRKoEg=; b=hzfkcuW9c3jyqAAkVYswoIOMuRBjtxmeyAe0wf38lgB78x4Sd/5iCqRe86JwxEYc7zC/tQ h8oYIa0zidnxD4MXm9dXkWZF75Ex/sJ/jMQLxkj+dl7TP+CJaI5y4uzjF7dV4QGXKanOws e+zx3b4pvAX9YE+XfkqHy6rrou+NLOWdGAshm8fG0qPFeuYjXoJFxncYrWTwf3YYp41BWK cccffqEJHVs2mOKwoYw2cLIow3d0YVkRhGO6U9EN2Lp1JUSkydy+7NiK+devUnAYf4Qz9L TT75zvB90E1exyedaws3KAs2j3KFHlnHS+tEXpqmICWDikNuFj6eK2gMBP/F1g== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1641903971; a=rsa-sha256; cv=none; b=lSv8HcQc0RsRJL1d6RWJcWkwQtVZgc6u7v4J3+ipNvM/0X2CJaGZIQtF1O5PN6Eb+UQxFs UTf7yFO8j1PptC7BJiR9j6QKtMYPM/2VX5B9biooZnQJcNUYD2Zt6OL87Eu7R9fslv6H5W FgoIM/dlylutB/BwzPr4qKCrvKitGkYXRuCsb9Mye1TJltfhuOBlV5pQy8TV2D+cIbRp6m 1mULW3S4J3UNnDzw7YszmpFQe76SCU1XyTLZnp+Y2EhINHvg4kgC7XIQYNESHjCdl0Y3lz jdkmexBlHY8ZsQXyETG4LutQlGmBFyjF0cKsFEqWwql5rNBt3aeS2+nCj47YlA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b="B6RyT/0A"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -2.71 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b="B6RyT/0A"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 58C3FE366 X-Spam-Score: -2.71 X-Migadu-Scanner: scn0.migadu.com X-TUID: 33hUZ/Cbs0xE After submitting a patch to update the package darktable to the last version, it appeared that the version 5.4 of lua is necessary. It is why I am submitting that patch. Kind regards, Alex --- gnu/packages/lua.scm | 12 +++ gnu/packages/patches/lua-5.4-liblua-so.patch | 31 ++++++ gnu/packages/patches/lua-5.4-pkgconfig.patch | 106 +++++++++++++++++++ 3 files changed, 149 insertions(+) create mode 100644 gnu/packages/patches/lua-5.4-liblua-so.patch create mode 100644 gnu/packages/patches/lua-5.4-pkgconfig.patch diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index ff4d4824eb..99f09a26f1 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -105,6 +105,18 @@ (define-public lua for configuration, scripting, and rapid prototyping.") (license license:x11))) +(define-public lua-5.4 + (package (inherit lua) + (version "5.4.3") + (source (origin + (method url-fetch) + (uri (string-append "https://www.lua.org/ftp/lua-" + version ".tar.gz")) + (sha256 + (base32 "1yxvjvnbg4nyrdv10bq42gz6dr66pyan28lgzfygqfwy2rv24qgq")) + (patches (search-patches "lua-5.4-pkgconfig.patch" + "lua-5.4-liblua-so.patch")))))) + (define-public lua-5.2 (package (inherit lua) (version "5.2.4") diff --git a/gnu/packages/patches/lua-5.4-liblua-so.patch b/gnu/packages/patches/lua-5.4-liblua-so.patch new file mode 100644 index 0000000000..0f35887012 --- /dev/null +++ b/gnu/packages/patches/lua-5.4-liblua-so.patch @@ -0,0 +1,31 @@ +--- a/src/Makefile 2021-02-09 18:47:17.000000000 +0000 ++++ b/src/Makefile 2022-01-03 11:30:36.964501941 +0000 +@@ -33,6 +33,7 @@ + PLATS= guess aix bsd c89 freebsd generic linux linux-readline 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 + LIB_O= lauxlib.o lbaselib.o lcorolib.o ldblib.o liolib.o lmathlib.o loadlib.o loslib.o lstrlib.o ltablib.o lutf8lib.o linit.o + BASE_O= $(CORE_O) $(LIB_O) $(MYOBJS) +@@ -44,7 +45,7 @@ + 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. +@@ -56,6 +57,11 @@ + + 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) $@ diff --git a/gnu/packages/patches/lua-5.4-pkgconfig.patch b/gnu/packages/patches/lua-5.4-pkgconfig.patch new file mode 100644 index 0000000000..0a80cef9db --- /dev/null +++ b/gnu/packages/patches/lua-5.4-pkgconfig.patch @@ -0,0 +1,106 @@ +--- a/Makefile 2022-01-03 12:06:37.760402709 +0000 ++++ b/Makefile 2022-01-03 12:06:49.568402167 +0000 +@@ -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= guess aix bsd c89 freebsd generic linux linux-readline 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_LIB= liblua.a liblua.so liblua.so.${V} ++TO_PC= lua-$(V).pc + TO_MAN= lua.1 luac.1 + + # Lua version and release. +@@ -51,20 +55,26 @@ + # Targets start here. + all: $(PLAT) + +-$(PLATS) help test clean: +- @cd src && $(MAKE) $@ ++$(PLATS): ++ @cd src && $(MAKE) $@ V=$(V) R=$(R) + +-install: dummy +- cd src && $(MKDIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD) ++clean: ++ cd src && $(MAKE) $@ ++ $(RM) $(TO_PC) ++ ++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) + + 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: +@@ -82,11 +92,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)" +@@ -95,12 +107,29 @@ + + # 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 > $@ ++ + + # Targets that do not create files (not all makes understand .PHONY). +-.PHONY: all $(PLATS) help test clean install uninstall local dummy echo pc ++.PHONY: all $(PLATS) help test clean install uninstall local dummy echo pc pkg-config + + # (end of Makefile) -- 2.34.0