From: "Leo Nikkilä" <hello@lnikki.la>
To: 58901@debbugs.gnu.org
Cc: "Leo Nikkilä" <hello@lnikki.la>
Subject: [bug#58901] [PATCH] gnu: luajit: Update to commit 6c4826.
Date: Sun, 30 Oct 2022 21:19:56 +0200 [thread overview]
Message-ID: <20221030191953.690-2-hello@lnikki.la> (raw)
In-Reply-To: <20221030191953.690-1-hello@lnikki.la>
* 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 <code@greghogan.com>
;;; Copyright © 2022 Brandon Lucas <br@ndon.dk>
;;; Copyright © 2022 Luis Henrique Gomes Higino <luishenriquegh2701@gmail.com>
+;;; Copyright © 2022 Leo Nikkilä <hello@lnikki.la>
;;;
;;; 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?= <sleep_walker@suse.cz>
-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
-
--
2.34.0
next prev parent reply other threads:[~2022-10-30 19:23 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-30 19:19 [bug#58901] [PATCH] gnu: luajit: Update to commit 6c4826 Leo Nikkilä
2022-10-30 19:19 ` Leo Nikkilä [this message]
2022-11-14 11:23 ` bug#58901: " Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221030191953.690-2-hello@lnikki.la \
--to=hello@lnikki.la \
--cc=58901@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).