ucode: fix host installation
authorDavid Bauer <david.bauer@uniberg.com>
Mon, 19 Aug 2024 13:25:10 +0000 (15:25 +0200)
committerRISCi_ATOM <bob@bobcall.me>
Thu, 19 Sep 2024 15:27:13 +0000 (11:27 -0400)
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)

package/utils/ucode/Makefile

index 9772085310408f25648107e0d184cbe4a9513857..79064bbe0a1b4240fbae6cbed17ca32de6422510 100644 (file)
@@ -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 += \