diff mbox series

[meta-multimedia,v3] libmusicbrainz: Upgrade to tip of trunk

Message ID 20250716064256.337846-1-raj.khem@gmail.com
State New
Headers show
Series [meta-multimedia,v3] libmusicbrainz: Upgrade to tip of trunk | expand

Commit Message

Khem Raj July 16, 2025, 6:42 a.m. UTC 
* Brings fixes for cmake4 builds

* Define _IMPORT_PREFIX using CMAKE_CURRENT_LIST_DIR, this
  will point current recipe-sysroot-native/usr which is then
  prepended to find the native make-c-interface binary

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../recipes-multimedia/musicbrainz/libmusicbrainz_git.bb    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/meta-multimedia/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb b/meta-multimedia/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb
index 1ae43e8aef..9486dec17e 100644
--- a/meta-multimedia/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb
+++ b/meta-multimedia/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb
@@ -7,7 +7,7 @@  DEPENDS = "expat libxml2 libxml2-native neon neon-native libmusicbrainz-native"
 
 PV = "5.1.0+git"
 
-SRCREV = "4655b571a70d73d41467091f59c518517c956198"
+SRCREV = "4efbed3afae11ef68281816088d7cf3d0f704dfe"
 SRC_URI = "git://github.com/metabrainz/libmusicbrainz.git;branch=master;protocol=https \
            file://0001-http-fetch-Pass-a-non-null-buffer-to-ne_set_request_.patch \
            "
@@ -20,7 +20,9 @@  EXTRA_OECMAKE:append:class-target = " -DIMPORT_EXECUTABLES=${STAGING_LIBDIR_NATI
 do_install:append:class-native() {
     install -Dm 0755 ${B}/src/make-c-interface ${D}${bindir}/make-c-interface
     install -Dm 0644 ${B}/ImportExecutables.cmake ${D}${libdir}/cmake/${BPN}/ImportExecutables.cmake
-    sed -i -e s:'${B}'/src/::g ${D}${libdir}/cmake/${BPN}/ImportExecutables.cmake
+	sed -i '/^# Create imported target make-c-interface$/a\
+get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_DIR}/../../../" ABSOLUTE)' ${D}${libdir}/cmake/${BPN}/ImportExecutables.cmake
+    sed -i -e 's:${B}/src/:${_IMPORT_PREFIX}/bin/:g' ${D}${libdir}/cmake/${BPN}/ImportExecutables.cmake
 }
 
 BBCLASSEXTEND = "native"