| 1 |
commit: 5f5a0bb3c9c316e21701d998d39eeec2fe3ac683 |
| 2 |
Author: Rafael Martins <rafaelmartins <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Feb 1 21:52:07 2020 +0000 |
| 4 |
Commit: Rafael Martins <rafaelmartins <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Feb 1 21:55:05 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f5a0bb3 |
| 7 |
|
| 8 |
dev-lang/luajit: fix build for musl systems. bug #707588 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.79, Repoman-2.3.16 |
| 11 |
Signed-off-by: Rafael Martins <rafaelmartins <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-lang/luajit/files/luajit-2-ldconfig.patch | 31 +++++++++++++++++++++++++++ |
| 14 |
dev-lang/luajit/luajit-2.0.5-r1.ebuild | 4 +++- |
| 15 |
dev-lang/luajit/luajit-2.1.0_beta3.ebuild | 4 +++- |
| 16 |
3 files changed, 37 insertions(+), 2 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-lang/luajit/files/luajit-2-ldconfig.patch b/dev-lang/luajit/files/luajit-2-ldconfig.patch |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..add449a6038 |
| 21 |
--- /dev/null |
| 22 |
+++ b/dev-lang/luajit/files/luajit-2-ldconfig.patch |
| 23 |
@@ -0,0 +1,31 @@ |
| 24 |
+From 18c9cf7d3788a8f7408df45df92fc4ae3bcc0d80 Mon Sep 17 00:00:00 2001 |
| 25 |
+From: Mike Pall <mike> |
| 26 |
+Date: Sat, 25 Jan 2020 17:37:12 +0100 |
| 27 |
+Subject: [PATCH] Fix POSIX install with missing or incompatible ldconfig. |
| 28 |
+ |
| 29 |
+--- |
| 30 |
+ Makefile | 4 ++-- |
| 31 |
+ 1 file changed, 2 insertions(+), 2 deletions(-) |
| 32 |
+ |
| 33 |
+diff --git a/Makefile b/Makefile |
| 34 |
+index 07bc70faf..bff53f286 100644 |
| 35 |
+--- a/Makefile |
| 36 |
++++ b/Makefile |
| 37 |
+@@ -74,7 +74,7 @@ SYMLINK= ln -sf |
| 38 |
+ INSTALL_X= install -m 0755 |
| 39 |
+ INSTALL_F= install -m 0644 |
| 40 |
+ UNINSTALL= $(RM) |
| 41 |
+-LDCONFIG= ldconfig -n |
| 42 |
++LDCONFIG= ldconfig -n 2>/dev/null |
| 43 |
+ SED_PC= sed -e "s|^prefix=.*|prefix=$(PREFIX)|" \ |
| 44 |
+ -e "s|^multilib=.*|multilib=$(MULTILIB)|" |
| 45 |
+ |
| 46 |
+@@ -118,7 +118,7 @@ install: $(INSTALL_DEP) |
| 47 |
+ $(RM) $(INSTALL_TSYM) $(INSTALL_DYN) $(INSTALL_SHORT1) $(INSTALL_SHORT2) |
| 48 |
+ cd src && test -f $(FILE_SO) && \ |
| 49 |
+ $(INSTALL_X) $(FILE_SO) $(INSTALL_DYN) && \ |
| 50 |
+- $(LDCONFIG) $(INSTALL_LIB) && \ |
| 51 |
++ ( $(LDCONFIG) $(INSTALL_LIB) || : ) && \ |
| 52 |
+ $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT1) && \ |
| 53 |
+ $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT2) || : |
| 54 |
+ cd etc && $(INSTALL_F) $(FILE_MAN) $(INSTALL_MAN) |
| 55 |
|
| 56 |
diff --git a/dev-lang/luajit/luajit-2.0.5-r1.ebuild b/dev-lang/luajit/luajit-2.0.5-r1.ebuild |
| 57 |
index a90f9c43d19..6b07deee37a 100644 |
| 58 |
--- a/dev-lang/luajit/luajit-2.0.5-r1.ebuild |
| 59 |
+++ b/dev-lang/luajit/luajit-2.0.5-r1.ebuild |
| 60 |
@@ -1,4 +1,4 @@ |
| 61 |
-# Copyright 1999-2018 Gentoo Foundation |
| 62 |
+# Copyright 1999-2020 Gentoo Authors |
| 63 |
# Distributed under the terms of the GNU General Public License v2 |
| 64 |
|
| 65 |
EAPI=6 |
| 66 |
@@ -23,6 +23,8 @@ SLOT="2" |
| 67 |
KEYWORDS="amd64 arm ppc x86 ~amd64-linux ~x86-linux" |
| 68 |
IUSE="lua52compat static-libs" |
| 69 |
|
| 70 |
+PATCHES=( "${FILESDIR}/${PN}-2-ldconfig.patch" ) |
| 71 |
+ |
| 72 |
S="${WORKDIR}/${MY_P}" |
| 73 |
|
| 74 |
src_prepare(){ |
| 75 |
|
| 76 |
diff --git a/dev-lang/luajit/luajit-2.1.0_beta3.ebuild b/dev-lang/luajit/luajit-2.1.0_beta3.ebuild |
| 77 |
index 6497ae142c3..9406beb98c8 100644 |
| 78 |
--- a/dev-lang/luajit/luajit-2.1.0_beta3.ebuild |
| 79 |
+++ b/dev-lang/luajit/luajit-2.1.0_beta3.ebuild |
| 80 |
@@ -1,4 +1,4 @@ |
| 81 |
-# Copyright 1999-2019 Gentoo Authors |
| 82 |
+# Copyright 1999-2020 Gentoo Authors |
| 83 |
# Distributed under the terms of the GNU General Public License v2 |
| 84 |
|
| 85 |
EAPI=6 |
| 86 |
@@ -19,6 +19,8 @@ SLOT="2" |
| 87 |
KEYWORDS="" |
| 88 |
IUSE="lua52compat static-libs" |
| 89 |
|
| 90 |
+PATCHES=( "${FILESDIR}/${PN}-2-ldconfig.patch" ) |
| 91 |
+ |
| 92 |
S="${WORKDIR}/${MY_P}" |
| 93 |
|
| 94 |
_emake() { |
Archives