dev-lang/luajit: fix build for musl systems. bug #707588

Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Rafael Martins <rafaelmartins@gentoo.org>

diff --git a/dev-lang/luajit/files/luajit-2-ldconfig.patch b/dev-lang/luajit/files/luajit-2-ldconfig.patch
new file mode 100644 (file)
index 0000000..add449a
--- /dev/null
+++ b/dev-lang/luajit/files/luajit-2-ldconfig.patch
@@ -0,0 +1,31 @@
+From 18c9cf7d3788a8f7408df45df92fc4ae3bcc0d80 Mon Sep 17 00:00:00 2001
+From: Mike Pall <mike>
+Date: Sat, 25 Jan 2020 17:37:12 +0100
+Subject: [PATCH] Fix POSIX install with missing or incompatible ldconfig.
+
+---
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 07bc70faf..bff53f286 100644
+--- a/Makefile
++++ b/Makefile
+@@ -74,7 +74,7 @@ SYMLINK= ln -sf
+ INSTALL_X= install -m 0755
+ INSTALL_F= install -m 0644
+ UNINSTALL= $(RM)
+-LDCONFIG= ldconfig -n
++LDCONFIG= ldconfig -n 2>/dev/null
+ SED_PC= sed -e "s|^prefix=.*|prefix=$(PREFIX)|" \
+             -e "s|^multilib=.*|multilib=$(MULTILIB)|"
+ 
+@@ -118,7 +118,7 @@ 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) && \
++        ( $(LDCONFIG) $(INSTALL_LIB) || : ) && \
+         $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT1) && \
+         $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT2) || :
+       cd etc && $(INSTALL_F) $(FILE_MAN) $(INSTALL_MAN)

diff --git a/dev-lang/luajit/luajit-2.0.5-r1.ebuild b/dev-lang/luajit/luajit-2.0.5-r1.ebuild
index a90f9c43d19b0ee006d171f62736f3da77a73a2f..6b07deee37a785ca6d00642ea5cd365be7282494 100644 (file)
--- a/dev-lang/luajit/luajit-2.0.5-r1.ebuild
+++ b/dev-lang/luajit/luajit-2.0.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,6 +23,8 @@ SLOT="2"
 KEYWORDS="amd64 arm ppc x86 ~amd64-linux ~x86-linux"
 IUSE="lua52compat static-libs"
 
+PATCHES=( "${FILESDIR}/${PN}-2-ldconfig.patch" )
+
 S="${WORKDIR}/${MY_P}"
 
 src_prepare(){

diff --git a/dev-lang/luajit/luajit-2.1.0_beta3.ebuild b/dev-lang/luajit/luajit-2.1.0_beta3.ebuild
index 6497ae142c34bfb623b6386dda7f24051ef07c85..9406beb98c84a1437c57522cf1cf6ea7c4dada49 100644 (file)
--- a/dev-lang/luajit/luajit-2.1.0_beta3.ebuild
+++ b/dev-lang/luajit/luajit-2.1.0_beta3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,6 +19,8 @@ SLOT="2"
 KEYWORDS=""
 IUSE="lua52compat static-libs"
 
+PATCHES=( "${FILESDIR}/${PN}-2-ldconfig.patch" )
+
 S="${WORKDIR}/${MY_P}"
 
 _emake() {