From: Felix Fietkau <nbd@nbd.name>
Date: Thu, 21 Dec 2023 16:29:45 +0000 (+0100)
Subject: libubox: work around recent macOS linker change
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=32d2443476188f880395e52e0216c84dce9670f8;p=openwrt%2Fstaging%2Fthess.git

libubox: work around recent macOS linker change

rpath handling seems to be more restrictive now. To deal with this,
link the libubox library from STAGING_DIR_HOST to STAGING_DIR_HOSTPKG, so that
packages installed to STAGING_DIR_HOSTPKG can pick it up. This mainly affects
ucode, but possibly other host builds as well

Signed-off-by: Felix Fietkau <nbd@nbd.name>
---

diff --git a/package/libs/libubox/Makefile b/package/libs/libubox/Makefile
index 549e604679..1ea886e6ac 100644
--- a/package/libs/libubox/Makefile
+++ b/package/libs/libubox/Makefile
@@ -105,6 +105,14 @@ CMAKE_HOST_OPTIONS += \
 	-DCMAKE_MACOSX_RPATH=1 \
 	-DCMAKE_INSTALL_RPATH="${STAGING_DIR_HOST}/lib" \
 
+ifeq ($(HOST_OS),Darwin)
+  define Host/Install
+	$(Host/Install/Default)
+	$(INSTALL_DIR) $(STAGING_DIR_HOSTPKG)/lib
+	cd "$(STAGING_DIR_HOSTPKG)/lib" && ln -sf ../../host/lib/libubox.* .
+  endef
+endif
+
 $(eval $(call BuildPackage,libubox))
 $(eval $(call BuildPackage,libblobmsg-json))
 $(eval $(call BuildPackage,jshn))