diff options
| author | Samuli Piippo <samuli.piippo@gmail.com> | 2025-04-25 06:29:50 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-04-29 09:55:31 +0100 |
| commit | d8fe48df20a44339d4f219b6ae852ed2e9bd0d36 (patch) | |
| tree | 64c5eca858bc10f9307ffca5cc759b81b3f58978 | |
| parent | 9440ea06482b35593b01f2cc204bdf76b594d2e3 (diff) | |
| download | poky-d8fe48df20a44339d4f219b6ae852ed2e9bd0d36.tar.gz | |
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.
(From OE-Core rev: 7ffbc913d4b03da4154341f5ca995f767a3bee33)
Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-graphics/jpeg/libjpeg-turbo_3.0.1.bb | 8 |
1 files changed, 3 insertions, 5 deletions
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 | |||
| 23 | 23 | ||
| 24 | export NASMENV = "--reproducible --debug-prefix-map=${WORKDIR}=${TARGET_DBGSRC_DIR}" | 24 | export NASMENV = "--reproducible --debug-prefix-map=${WORKDIR}=${TARGET_DBGSRC_DIR}" |
| 25 | 25 | ||
| 26 | # The binaries have RUNPATH=$libdir, which is redundant | ||
| 27 | EXTRA_OECMAKE += "-DCMAKE_SKIP_INSTALL_RPATH=ON" | ||
| 28 | |||
| 26 | # Add nasm-native dependency consistently for all build arches is hard | 29 | # Add nasm-native dependency consistently for all build arches is hard |
| 27 | EXTRA_OECMAKE:append:class-native = " -DWITH_SIMD=False" | 30 | EXTRA_OECMAKE:append:class-native = " -DWITH_SIMD=False" |
| 28 | EXTRA_OECMAKE:append:class-nativesdk = " -DWITH_SIMD=False" | 31 | EXTRA_OECMAKE:append:class-nativesdk = " -DWITH_SIMD=False" |
| @@ -52,9 +55,4 @@ FILES:jpeg-tools = "${bindir}/*" | |||
| 52 | DESCRIPTION:libturbojpeg = "A SIMD-accelerated JPEG codec which provides only TurboJPEG APIs" | 55 | DESCRIPTION:libturbojpeg = "A SIMD-accelerated JPEG codec which provides only TurboJPEG APIs" |
| 53 | FILES:libturbojpeg = "${libdir}/libturbojpeg.so.*" | 56 | FILES:libturbojpeg = "${libdir}/libturbojpeg.so.*" |
| 54 | 57 | ||
| 55 | do_install:append() { | ||
| 56 | # The binaries have RUNPATH=$libdir, which is redundant | ||
| 57 | chrpath -d ${D}/${bindir}/* ${D}${libdir}/*${SOLIBS} | ||
| 58 | } | ||
| 59 | |||
| 60 | BBCLASSEXTEND = "native nativesdk" | 58 | BBCLASSEXTEND = "native nativesdk" |
