[Buildroot] [git commit branch/2018.02.x] jpeg-turbo: fix install with a static only lib
From: Peter Korsgaard <peter@korsgaard.com>
Date: 2019-02-21 10:36:53
Subsystem:
the rest · Maintainer:
Linus Torvalds
commit: https://git.buildroot.net/buildroot/commit/?id=493a7779e421859abd38085e6e4bee8e1b1d7d7a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2018.02.x Define CMAKE_INSTALL_RPATH only if ENABLE_SHARED is set otherwise the following error is raised when installing binaries: CMake Error at cmake_install.cmake:73 (file): file RPATH_CHANGE could not write new RPATH: /usr/lib to the file: /home/fabrice/buildroot/output/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/bin/rdjpgcom No valid ELF RPATH or RUNPATH entry exists in the file; Signed-off-by: Fabrice Fontaine <redacted> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> (cherry picked from commit 7f905250bf66542efa3cd4dfbbb672aa1db0ce3c) Signed-off-by: Peter Korsgaard <peter@korsgaard.com> --- ...ll-of-binaries-with-a-static-only-library.patch | 42 ++++++++++++++++++++++ 1 file changed, 42 insertions(+)
diff --git a/package/jpeg-turbo/0001-fix-install-of-binaries-with-a-static-only-library.patch b/package/jpeg-turbo/0001-fix-install-of-binaries-with-a-static-only-library.patch
new file mode 100644
index 0000000000..87f9c48382
--- /dev/null
+++ b/package/jpeg-turbo/0001-fix-install-of-binaries-with-a-static-only-library.patch@@ -0,0 +1,42 @@ +From f8c7732e24502c06739944f9a721c9d84a50319d Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine <fontaine.fabrice@gmail.com> +Date: Sun, 26 Aug 2018 19:11:55 +0200 +Subject: [PATCH] fix install of binaries with a static only library + +Define CMAKE_INSTALL_RPATH only if ENABLE_SHARED is set otherwise the +following error is raised: + +CMake Error at cmake_install.cmake:73 (file): + file RPATH_CHANGE could not write new RPATH: + + /usr/lib + + to the file: + + /home/fabrice/buildroot/output/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/bin/rdjpgcom + + No valid ELF RPATH or RUNPATH entry exists in the file; + +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> +[Upstream status: https://github.com/libjpeg-turbo/libjpeg-turbo/pull/273] +--- + CMakeLists.txt | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1719522..862ab11 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -109,7 +109,9 @@ endif() + + include(cmakescripts/GNUInstallDirs.cmake) + ++if(ENABLE_SHARED) + set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR}) ++endif() + + macro(report_directory var) + if(CMAKE_INSTALL_${var} STREQUAL CMAKE_INSTALL_FULL_${var}) +-- +2.14.1 +