diff options
| author | Fabrice Fontaine <fontaine.fabrice@gmail.com> | 2018-08-26 19:23:13 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@bootlin.com> | 2018-09-02 23:02:28 +0200 |
| commit | 7f905250bf66542efa3cd4dfbbb672aa1db0ce3c (patch) | |
| tree | 25fe4a384353c12f042a9768707c123f48105934 | |
| parent | ce359b1b4abb0cd9b2dace9a9c65204e5c36ea9a (diff) | |
| download | buildroot-7f905250bf66542efa3cd4dfbbb672aa1db0ce3c.tar.gz buildroot-7f905250bf66542efa3cd4dfbbb672aa1db0ce3c.zip | |
jpeg-turbo: fix install with a static only lib
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 <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
| -rw-r--r-- | package/jpeg-turbo/0001-fix-install-of-binaries-with-a-static-only-library.patch | 42 |
1 files changed, 42 insertions, 0 deletions
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 + |
