summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Bauer2024-08-19 13:25:10 +0000
committerDavid Bauer2024-09-13 01:16:31 +0000
commitcc938b18a8e3b640376820ffbd6a70713526790e (patch)
tree475516992d65a2a09b0c0adb59cafd9596ed5c41
parentee3efefc5e059773e9fea56f1f65bf39f5d75cbc (diff)
downloadopenwrt-cc938b18a8e3b640376820ffbd6a70713526790e.tar.gz
ucode: fix host installation
The path for linking libucode.so was not specified for the ucode binary. This breaks execution of ucode in the host context. Signed-off-by: David Bauer <david.bauer@uniberg.com> (cherry picked from commit ae42ecaad4e7b4878083f08a2cba6ce511ac6c43)
-rw-r--r--package/utils/ucode/Makefile13
1 files changed, 7 insertions, 6 deletions
diff --git a/package/utils/ucode/Makefile b/package/utils/ucode/Makefile
index cb1ac86832..b048dcfcec 100644
--- a/package/utils/ucode/Makefile
+++ b/package/utils/ucode/Makefile
@@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=ucode
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL=https://github.com/jow-/ucode.git
@@ -25,16 +25,17 @@ include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/host-build.mk
include $(INCLUDE_DIR)/cmake.mk
-CMAKE_OPTIONS += -DSOVERSION=$(PKG_ABI_VERSION)
+CMAKE_OPTIONS += \
+ -DSOVERSION=$(PKG_ABI_VERSION)
+ -DCMAKE_SKIP_RPATH=FALSE \
+ -DCMAKE_INSTALL_RPATH="${STAGING_DIR_HOSTPKG}/lib"
ifeq ($(HOST_OS),Darwin)
CMAKE_HOST_OPTIONS += \
- -DCMAKE_SKIP_RPATH=FALSE \
- -DCMAKE_MACOSX_RPATH=1 \
- -DCMAKE_INSTALL_RPATH="${STAGING_DIR_HOSTPKG}/lib"
+ -DCMAKE_MACOSX_RPATH=1
else
CMAKE_HOST_OPTIONS += \
- -DSOVERSION=$(PKG_ABI_VERSION)
+ -DUSE_RPATH="${STAGING_DIR_HOSTPKG}/lib"
endif
CMAKE_HOST_OPTIONS += \