Skip to content

Commit

Permalink
dev-lang/luajit: fix build for musl systems. bug #707588
Browse files Browse the repository at this point in the history
Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Rafael Martins <[email protected]>
  • Loading branch information
Rafael Martins committed Feb 1, 2020
1 parent 8857143 commit 5f5a0bb
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 2 deletions.
31 changes: 31 additions & 0 deletions dev-lang/luajit/files/luajit-2-ldconfig.patch
Original file line number Diff line number Diff line change
@@ -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)
4 changes: 3 additions & 1 deletion dev-lang/luajit/luajit-2.0.5-r1.ebuild
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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(){
Expand Down
4 changes: 3 additions & 1 deletion dev-lang/luajit/luajit-2.1.0_beta3.ebuild
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -19,6 +19,8 @@ SLOT="2"
KEYWORDS=""
IUSE="lua52compat static-libs"

PATCHES=( "${FILESDIR}/${PN}-2-ldconfig.patch" )

S="${WORKDIR}/${MY_P}"

_emake() {
Expand Down

0 comments on commit 5f5a0bb

Please sign in to comment.