From: DRC Date: Mon, 12 Nov 2018 17:22:07 +0000 (-0600) Subject: Build: Fix install error with fully static build X-Git-Tag: 2.0.1~2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=950580eb0c020598a4c6c8aa46c86e31062e1ddc;p=libjpeg-turbo Build: Fix install error with fully static build Closes #273 --- diff --git a/CMakeLists.txt b/CMakeLists.txt index f481a57..efeb51a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -109,7 +109,9 @@ endif() include(cmakescripts/GNUInstallDirs.cmake) -set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR}) +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}) diff --git a/ChangeLog.md b/ChangeLog.md index e479b57..8c529ec 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -23,6 +23,10 @@ a specially-crafted malformed color-index (8-bit-per-sample) Targa file in which some of the samples (color indices) exceeded the bounds of the Targa file's color table. +5. Fixed an issue whereby installing a fully static build of libjpeg-turbo +(a build in which `CFLAGS` contains `-static` and `ENABLE_SHARED` is `0`) would +fail with "No valid ELF RPATH or RUNPATH entry exists in the file." + 2.0.0 =====