luajit: fix build on macos (ldconfig issue)
fix ldconfig build issue. This patch is a backport from upstream:18c9cf7d37
Signed-off-by: Sergey V. Lobanov <sergey@lobanov.in> (cherry picked from commit42c4d25455
)
This commit is contained in:
parent
f08dae84f8
commit
998fac7cfa
2 changed files with 27 additions and 1 deletions
|
@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
|
|||
|
||||
PKG_NAME:=luajit
|
||||
PKG_VERSION:=2.1.0-beta3
|
||||
PKG_RELEASE:=5
|
||||
PKG_RELEASE:=6
|
||||
|
||||
PKG_SOURCE:=LuaJIT-$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_URL:=https://luajit.org/download
|
||||
|
|
|
@ -0,0 +1,26 @@
|
|||
commit 18c9cf7d3788a8f7408df45df92fc4ae3bcc0d80
|
||||
Author: Mike Pall <mike>
|
||||
Date: Sat Jan 25 17:37:12 2020 +0100
|
||||
|
||||
Fix POSIX install with missing or incompatible ldconfig.
|
||||
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -75,7 +75,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)|"
|
||||
|
||||
@@ -121,7 +121,7 @@ install: $(INSTALL_DEP)
|
||||
$(RM) $(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)
|
Loading…
Reference in a new issue