[openwrt/openwrt] ucode: another fix for host installation

LEDE Commits lede-commits at lists.infradead.org
Fri Sep 20 13:24:33 PDT 2024


hauke pushed a commit to openwrt/openwrt.git, branch openwrt-23.05:
https://git.openwrt.org/66055df3e0d8624587637f7a53285e6934008c54

commit 66055df3e0d8624587637f7a53285e6934008c54
Author: Felix Fietkau <nbd at nbd.name>
AuthorDate: Fri Sep 20 11:23:24 2024 +0200

    ucode: another fix for host installation
    
    The previous host installation fix accidentally moved the rpath settings
    out of CMAKE_HOST_OPTIONS and into CMAKE_OPTIONS.
    
    Fixes: ae42ecaad4e7 ("ucode: fix host installation")
    Signed-off-by: Felix Fietkau <nbd at nbd.name>
    (cherry picked from commit 2ee1392e094f9b6fdb2a759e2e29fa203b61e066)
---
 package/utils/ucode/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/utils/ucode/Makefile b/package/utils/ucode/Makefile
index 7fc5e9b071..b00dcf7572 100644
--- a/package/utils/ucode/Makefile
+++ b/package/utils/ucode/Makefile
@@ -26,7 +26,9 @@ include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/cmake.mk
 
 CMAKE_OPTIONS += \
-	-DSOVERSION=$(PKG_ABI_VERSION) \
+	-DSOVERSION=$(PKG_ABI_VERSION)
+
+CMAKE_HOST_OPTIONS += \
 	-DCMAKE_SKIP_RPATH=FALSE \
 	-DCMAKE_INSTALL_RPATH="${STAGING_DIR_HOSTPKG}/lib"
 




More information about the lede-commits mailing list