]> granicus.if.org Git - libjpeg-turbo/commitdiff
Build: Fix install error with fully static build
authorDRC <information@libjpeg-turbo.org>
Mon, 12 Nov 2018 17:22:07 +0000 (11:22 -0600)
committerDRC <information@libjpeg-turbo.org>
Mon, 12 Nov 2018 17:22:48 +0000 (11:22 -0600)
Closes #273

CMakeLists.txt
ChangeLog.md

index f481a57e8bef6ed6b565c8fcf4643aa9a0d86d0b..efeb51aa7351530ec45c00e31eb2299f01271cd4 100644 (file)
@@ -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})
index e479b579b0dac30f99671b5a585ea44ee2a11067..8c529ecd3fc5db7a7599b832321519afb1134504 100644 (file)
@@ -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
 =====