From: Samuli Piippo <samuli.piippo@gmail.com>
Date: Fri, 25 Apr 2025 06:29:50 +0000 (+0000)
Subject: libjpeg-turbo: don't use chrpath
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7ffbc913d4b03da4154341f5ca995f767a3bee33;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

libjpeg-turbo: don't use chrpath

chrpath doesn't work on mingw32 binaries:

| `/build/tmp/work/x86_64-nativesdk-mingw32-w64-mingw32/nativesdk-libjpeg-turbo/3.0.1/image//usr/local/oe-sdk-hardcoded-buildpath/sysroots/x86_64-w64-mingw32/usr/bin/cjpeg.exe' probably isn't an ELF file.
| elf_open: Exec format error

Instead, use CMake variable to disable RPATH and avoid the
useless-rpaths QA error.

Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-graphics/jpeg/libjpeg-turbo_3.0.1.bb b/meta/recipes-graphics/jpeg/libjpeg-turbo_3.0.1.bb
index 56bab4daca..a1d7d57fb5 100644
--- a/meta/recipes-graphics/jpeg/libjpeg-turbo_3.0.1.bb
+++ b/meta/recipes-graphics/jpeg/libjpeg-turbo_3.0.1.bb
@@ -23,6 +23,9 @@ inherit cmake pkgconfig github-releases
 
 export NASMENV = "--reproducible --debug-prefix-map=${WORKDIR}=${TARGET_DBGSRC_DIR}"
 
+# The binaries have RUNPATH=$libdir, which is redundant
+EXTRA_OECMAKE += "-DCMAKE_SKIP_INSTALL_RPATH=ON"
+
 # Add nasm-native dependency consistently for all build arches is hard
 EXTRA_OECMAKE:append:class-native = " -DWITH_SIMD=False"
 EXTRA_OECMAKE:append:class-nativesdk = " -DWITH_SIMD=False"
@@ -52,9 +55,4 @@ FILES:jpeg-tools = "${bindir}/*"
 DESCRIPTION:libturbojpeg = "A SIMD-accelerated JPEG codec which provides only TurboJPEG APIs"
 FILES:libturbojpeg = "${libdir}/libturbojpeg.so.*"
 
-do_install:append() {
-    # The binaries have RUNPATH=$libdir, which is redundant
-    chrpath -d ${D}/${bindir}/* ${D}${libdir}/*${SOLIBS}
-}
-
 BBCLASSEXTEND = "native nativesdk"