forked from gentoo/gentoo
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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 <[email protected]>
- Loading branch information
Rafael Martins
committed
Feb 1, 2020
1 parent
8857143
commit 5f5a0bb
Showing
3 changed files
with
37 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters