mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
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>
This commit is contained in:
31
dev-lang/luajit/files/luajit-2-ldconfig.patch
Normal file
31
dev-lang/luajit/files/luajit-2-ldconfig.patch
Normal file
@@ -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)
|
||||
@@ -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(){
|
||||
|
||||
@@ -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() {
|
||||
|
||||
Reference in New Issue
Block a user