From: Sergey V. Lobanov <sergey@lobanov.in>
Date: Fri, 7 Jan 2022 22:48:08 +0000 (+0300)
Subject: luajit: fix build on macos (ldconfig issue)
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=42c4d254552c04f41a2b93811147ef56af45bf9c;p=feed%2Fpackages.git

luajit: fix build on macos (ldconfig issue)

fix ldconfig build issue. This patch is a backport from upstream:
https://github.com/LuaJIT/LuaJIT/commit/18c9cf7d3788a8f7408df45df92fc4ae3bcc0d80

Signed-off-by: Sergey V. Lobanov <sergey@lobanov.in>
---

diff --git a/lang/luajit/Makefile b/lang/luajit/Makefile
index abafb1764d..72e73beff7 100644
--- a/lang/luajit/Makefile
+++ b/lang/luajit/Makefile
@@ -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
diff --git a/lang/luajit/patches/030_fix_posix_install_with_missing_or_incompatible_ldconfig.patch b/lang/luajit/patches/030_fix_posix_install_with_missing_or_incompatible_ldconfig.patch
new file mode 100644
index 0000000000..70f664c1b0
--- /dev/null
+++ b/lang/luajit/patches/030_fix_posix_install_with_missing_or_incompatible_ldconfig.patch
@@ -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)