[openwrt/openwrt] ucode: fix build on macos

LEDE Commits lede-commits at lists.infradead.org
Thu Nov 2 03:30:53 PDT 2023


jow pushed a commit to openwrt/openwrt.git, branch openwrt-23.05:
https://git.openwrt.org/51b1d5950e2428a303d703a8b7ac66ef61a10485

commit 51b1d5950e2428a303d703a8b7ac66ef61a10485
Author: Felix Fietkau <nbd at nbd.name>
AuthorDate: Sat Oct 28 14:58:46 2023 +0200

    ucode: fix build on macos
    
    Remove ABI version, since its format is not accepted by the linker.
    Enable rpath to avoid clash with system libraries
    
    Signed-off-by: Felix Fietkau <nbd at nbd.name>
    (cherry picked from commit 5eb8a21ba5fe5e87c03f0361d1db989189be9c6d)
---
 package/utils/ucode/Makefile | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/package/utils/ucode/Makefile b/package/utils/ucode/Makefile
index c2f0607341..46112d31e8 100644
--- a/package/utils/ucode/Makefile
+++ b/package/utils/ucode/Makefile
@@ -25,8 +25,18 @@ include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/cmake.mk
 
 CMAKE_OPTIONS += -DSOVERSION=$(PKG_ABI_VERSION)
+
+ifeq ($(HOST_OS),Darwin)
+  CMAKE_HOST_OPTIONS += \
+	-DCMAKE_SKIP_RPATH=FALSE \
+	-DCMAKE_MACOSX_RPATH=1 \
+	-DCMAKE_INSTALL_RPATH="${STAGING_DIR_HOSTPKG}/lib"
+else
+  CMAKE_HOST_OPTIONS += \
+	-DSOVERSION=$(PKG_ABI_VERSION)
+endif
+
 CMAKE_HOST_OPTIONS += \
-	-DSOVERSION=$(PKG_ABI_VERSION) \
 	-DFS_SUPPORT=ON \
 	-DMATH_SUPPORT=ON \
 	-DNL80211_SUPPORT=OFF \




More information about the lede-commits mailing list