From patchwork Sun Oct 30 19:19:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Leo_Nikkil=C3=A4?= X-Patchwork-Id: 44201 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 0ED9427BBEA; Sun, 30 Oct 2022 19:23:18 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1DA5C27BBE9 for ; Sun, 30 Oct 2022 19:23:17 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1opDti-0001Pj-57; Sun, 30 Oct 2022 15:23:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1opDte-0001OK-Bp for guix-patches@gnu.org; Sun, 30 Oct 2022 15:23:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1opDte-0006TX-3B for guix-patches@gnu.org; Sun, 30 Oct 2022 15:23:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1opDtd-0005b1-Ty for guix-patches@gnu.org; Sun, 30 Oct 2022 15:23:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58901] [PATCH] gnu: luajit: Update to commit 6c4826. Resent-From: Leo =?utf-8?q?Nikkil=C3=A4?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 30 Oct 2022 19:23:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58901 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 58901@debbugs.gnu.org Cc: Leo =?utf-8?q?Nikkil=C3=A4?= X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.166715774721449 (code B ref -1); Sun, 30 Oct 2022 19:23:01 +0000 Received: (at submit) by debbugs.gnu.org; 30 Oct 2022 19:22:27 +0000 Received: from localhost ([127.0.0.1]:39030 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1opDt4-0005Zs-LT for submit@debbugs.gnu.org; Sun, 30 Oct 2022 15:22:27 -0400 Received: from lists.gnu.org ([209.51.188.17]:40918) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1opDt2-0005Zk-L1 for submit@debbugs.gnu.org; Sun, 30 Oct 2022 15:22:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1opDt0-00012l-Fg for guix-patches@gnu.org; Sun, 30 Oct 2022 15:22:22 -0400 Received: from wout2-smtp.messagingengine.com ([64.147.123.25]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1opDsu-0006Hd-Fa for guix-patches@gnu.org; Sun, 30 Oct 2022 15:22:18 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id B5FF83200258; Sun, 30 Oct 2022 15:22:14 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Sun, 30 Oct 2022 15:22:14 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lnikki.la; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm1; t=1667157734; x= 1667244134; bh=Rh3PTFpG4S/PpnafkMQGCJ/o9TfuD1CuCGMMyjSHqcw=; b=W Q0vI4m0vXwJ5/MEHddaca8QKQgc0JyXgl14neOE3XuIAEiNabBl9sbQ8QAs2BNPe k981VmSrlA9MbUwDggDkrlEGE64KvjjYzU9JcpusJtpgD0++02zmZ2t0qY8jgN7I JMHSVF4aeXyKjaQJ1bo496SKl9g8yoGwyZrUgN+F5WMbnlkzGATiJiIbNgUfru15 kA7VVWX3bXMMueiVbNEsdmonpr5EW9OxYhUAClcAoUIKCdqU/Zh+4b9SIb+71nxx XPRjNTGmaj4aIyZ0Xtn4pGNcq2FFSfbGwkDaoazo8rgirLyxpfwjv57xS/0s31T9 wbDcqgJSEFSvzMezF9b+g== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1667157734; x= 1667244134; bh=Rh3PTFpG4S/PpnafkMQGCJ/o9TfuD1CuCGMMyjSHqcw=; b=Z cGVJfZbGQY8B+AElpJ746Q2naa0m/AN7uo5TmlLdnW4WNhPsK7l+k/N421TFLjWW QcvZRyhNOlwuhZ8nZaXkcVEx9LyMJOqzO4KQi9GREafgw9rColAxhazpjAtCCWyz fAZMDrk4P2zZKuzHLhjFHlsTva51P00aXv/ofCi7puSr+x5MxxArCHfp6oo3XE/q Nh0ADR+0EJksmPLWdm9XvATWn0wtDxKqqhHJtoP7JjOV6vyk7IJvrPqmDWKWBYTf 8BbwE+OV9ANzwxAjggmBjVTu1iwMNX1+nr6g6kYhdUlHSK5K0Uy7t5rsxMbxgFkA qzLYKq40mc0aTBduSh33A== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvgedruddtgdduvdehucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesth ekredtredtjeenucfhrhhomhepnfgvohcupfhikhhkihhlmocuoehhvghllhhosehlnhhi khhkihdrlhgrqeenucggtffrrghtthgvrhhnpedvhfdvkefgiedulefghfekleefuefhke ehjeegleduheehueefgedugfekfedvueenucffohhmrghinheplhhurghjihhtrdhorhhg pdhgnhhurdhorhhgnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilh hfrhhomhephhgvlhhloheslhhnihhkkhhirdhlrg X-ME-Proxy: Feedback-ID: i41f146a7:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 30 Oct 2022 15:22:13 -0400 (EDT) From: Leo =?utf-8?q?Nikkil=C3=A4?= Date: Sun, 30 Oct 2022 21:19:56 +0200 Message-Id: <20221030191953.690-2-hello@lnikki.la> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20221030191953.690-1-hello@lnikki.la> References: <20221030191953.690-1-hello@lnikki.la> MIME-Version: 1.0 Received-SPF: pass client-ip=64.147.123.25; envelope-from=hello@lnikki.la; helo=wout2-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham 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: , Sender: "Guix-patches" Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/lua.scm (luajit)[source]: Use git-fetch, remove patch. * gnu/packages/patches/luajit-no_ldconfig.patch: Delete patch. --- gnu/packages/lua.scm | 73 ++++++++++--------- gnu/packages/patches/luajit-no_ldconfig.patch | 31 -------- 2 files changed, 39 insertions(+), 65 deletions(-) delete mode 100644 gnu/packages/patches/luajit-no_ldconfig.patch diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index 829c819975..d914228107 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -17,6 +17,7 @@ ;;; Copyright © 2021 Greg Hogan ;;; Copyright © 2022 Brandon Lucas ;;; Copyright © 2022 Luis Henrique Gomes Higino +;;; Copyright © 2022 Leo Nikkilä ;;; ;;; This file is part of GNU Guix. ;;; @@ -149,43 +150,47 @@ (define-public lua-5.1 "lua51-pkgconfig.patch")))))) (define-public luajit - (package - (name "luajit") - (version "2.1.0-beta3") - (source (origin - (method url-fetch) - (uri (string-append "http://luajit.org/download/LuaJIT-" - version ".tar.gz")) - (sha256 - (base32 "1hyrhpkwjqsv54hnnx4cl8vk44h9d6c9w0fz1jfjz00w255y7lhs")) - (patches (search-patches "luajit-no_ldconfig.patch")))) - (build-system gnu-build-system) - (arguments - `(#:tests? #f ; luajit is distributed without tests - #:phases - (modify-phases %standard-phases - (delete 'configure) ; no configure script - (add-after 'install 'create-luajit-symlink - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin"))) - (with-directory-excursion bin - (symlink ,(string-append name "-" version) - ,name) - #t))))) - #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))))) - (home-page "https://www.luajit.org/") - (synopsis "Just in time compiler for Lua programming language version 5.1") - ;; On powerpc64le-linux, the build fails with an error: "No support for - ;; PowerPC 64 bit mode (yet)". See: https://issues.guix.gnu.org/49220 - (supported-systems (fold delete %supported-systems - (list "powerpc64le-linux" "riscv64-linux"))) - (description - "LuaJIT is a Just-In-Time Compiler (JIT) for the Lua + (let ((branch "2.1.0-beta3") + (commit "6c4826f12c4d33b8b978004bc681eb1eef2be977")) + (package + (name "luajit") + (version (git-version branch "0" commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://luajit.org/git/luajit.git") + (commit commit))) + (sha256 + (base32 + "1a002yh8v1i1q9w09494q0b8vsbmw3amn9jgfs5qnz7ba54jij0q")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; luajit is distributed without tests + #:phases + (modify-phases %standard-phases + (delete 'configure) ; no configure script + (add-after 'install 'create-luajit-symlink + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) + (with-directory-excursion bin + (symlink ,(string-append name "-" branch) + ,name)))))) + #:make-flags (list (string-append "PREFIX=" + (assoc-ref %outputs "out"))))) + (home-page "https://www.luajit.org/") + (synopsis + "Just in time compiler for Lua programming language version 5.1") + ;; On powerpc64le-linux, the build fails with an error: "No support for + ;; PowerPC 64 bit mode (yet)". See: https://issues.guix.gnu.org/49220 + (supported-systems (fold delete %supported-systems + (list "powerpc64le-linux" "riscv64-linux"))) + (description + "LuaJIT is a Just-In-Time Compiler (JIT) for the Lua programming language. Lua is a powerful, dynamic and light-weight programming language. It may be embedded or used as a general-purpose, stand-alone language.") - (license license:x11))) + (license license:x11)))) (define-public luajit-lua52-openresty (package diff --git a/gnu/packages/patches/luajit-no_ldconfig.patch b/gnu/packages/patches/luajit-no_ldconfig.patch deleted file mode 100644 index 8000e8e4e5..0000000000 --- a/gnu/packages/patches/luajit-no_ldconfig.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 629200f48e18dc1a3a5229739748bad0e2a6a0a2 Mon Sep 17 00:00:00 2001 -From: =?utf8?q?Tom=C3=A1=C5=A1=20=C4=8Cech?= -Date: Wed, 4 Feb 2015 11:37:16 +0100 -Subject: [PATCH] Do not silently and prematurely end install when ldconfig is - missing - ---- - Makefile | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/Makefile b/Makefile -index 343ecb5..4667146 100644 ---- a/Makefile -+++ b/Makefile -@@ -112,9 +112,10 @@ install: $(INSTALL_DEP) - $(RM) $(INSTALL_TSYM) $(INSTALL_DYN) $(INSTALL_SHORT1) $(INSTALL_SHORT2) - cd src && test -f $(FILE_SO) && \ - $(INSTALL_X) $(FILE_SO) $(INSTALL_DYN) && \ -- $(LDCONFIG) $(INSTALL_LIB) && \ -- $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT1) && \ -- $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT2) || : -+ ( $(LDCONFIG) $(INSTALL_LIB) ; \ -+ $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT1) && \ -+ $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT2) || : \ -+ ) - cd etc && $(INSTALL_F) $(FILE_MAN) $(INSTALL_MAN) - cd etc && $(SED_PC) $(FILE_PC) > $(FILE_PC).tmp && \ - $(INSTALL_F) $(FILE_PC).tmp $(INSTALL_PC) && \ --- -2.2.2 -