diff --git a/build-dependencies-linux-cross.sh b/build-dependencies-linux-cross.sh index 771dfd2..4231d25 100755 --- a/build-dependencies-linux-cross.sh +++ b/build-dependencies-linux-cross.sh @@ -202,7 +202,8 @@ echo "Building libjpeg..." rm -fr "libjpeg-turbo-$LIBJPEGTURBO" tar xf "libjpeg-turbo-$LIBJPEGTURBO.tar.gz" cd "libjpeg-turbo-$LIBJPEGTURBO" -cmake "${CMAKE_COMMON[@]}" -DENABLE_STATIC=OFF -DENABLE_SHARED=ON -DWITH_TESTS=OFF -DWITH_TOOLS=OFF -DCMAKE_INSTALL_RPATH="\$ORIGIN" -B build -G Ninja +patch -p1 < "$SCRIPTDIR/patches/libjpeg-turbo-disable-rpath.patch" +cmake "${CMAKE_COMMON[@]}" -DENABLE_STATIC=OFF -DENABLE_SHARED=ON -DWITH_TESTS=OFF -DWITH_TOOLS=OFF -B build -G Ninja cmake --build build --parallel ninja -C build install cd .. diff --git a/build-dependencies-linux.sh b/build-dependencies-linux.sh index 45232f0..951e2de 100755 --- a/build-dependencies-linux.sh +++ b/build-dependencies-linux.sh @@ -145,7 +145,8 @@ echo "Building libjpeg..." rm -fr "libjpeg-turbo-$LIBJPEGTURBO" tar xf "libjpeg-turbo-$LIBJPEGTURBO.tar.gz" cd "libjpeg-turbo-$LIBJPEGTURBO" -cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DENABLE_STATIC=OFF -DENABLE_SHARED=ON -DWITH_TESTS=OFF -DWITH_TOOLS=OFF -DCMAKE_INSTALL_RPATH="\$ORIGIN" -B build -G Ninja +patch -p1 < "$SCRIPTDIR/patches/libjpeg-turbo-disable-rpath.patch" +cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DENABLE_STATIC=OFF -DENABLE_SHARED=ON -DWITH_TESTS=OFF -DWITH_TOOLS=OFF -B build -G Ninja cmake --build build --parallel ninja -C build install cd .. diff --git a/patches/libjpeg-turbo-disable-rpath.patch b/patches/libjpeg-turbo-disable-rpath.patch new file mode 100644 index 0000000..1bc90ec --- /dev/null +++ b/patches/libjpeg-turbo-disable-rpath.patch @@ -0,0 +1,11 @@ +--- libjpeg-turbo-3.1.3/CMakeLists.txt 2026-02-24 10:02:21.894697955 +0000 ++++ libjpeg-turbo-3.1.3/CMakeLists.txt 2026-02-24 10:02:47.706824038 +0000 +@@ -305,7 +305,7 @@ + report_option(ENABLE_STATIC "Static libraries") + + if(ENABLE_SHARED) +- set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR}) ++ #set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR}) + endif() + + if(WITH_JPEG8 OR WITH_JPEG7)