diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-05-08 23:29:25 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-05-11 21:55:01 +0200 |
| commit | b8bb2f0793aa2c5ff32956a90a0cfdb94bbe7a89 (patch) | |
| tree | 3c7383fe690088b3e2facb8a83d90a0cb87ab14d /gnu/packages/patches/ilmbase-openexr-pkg-config.patch | |
| parent | fef052b1b8238d6680437d62ce318e49922edb3d (diff) | |
gnu: OpenEXR: Update to 2.5.0.
* gnu/packages/patches/ilmbase-openexr-pkg-config.patch: Delete file.
* gnu/packages/patches/ilmbase-fix-test-arm.patch: New file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/graphics.scm (ilmbase): Update to 2.5.0.
Diffstat (limited to 'gnu/packages/patches/ilmbase-openexr-pkg-config.patch')
| -rw-r--r-- | gnu/packages/patches/ilmbase-openexr-pkg-config.patch | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/gnu/packages/patches/ilmbase-openexr-pkg-config.patch b/gnu/packages/patches/ilmbase-openexr-pkg-config.patch deleted file mode 100644 index 99613080d8..0000000000 --- a/gnu/packages/patches/ilmbase-openexr-pkg-config.patch +++ /dev/null @@ -1,40 +0,0 @@ -Fix pkg-config files when using the CMake build system. - -Upstream bug report: -https://github.com/openexr/openexr/issues/567 - -diff --git a/IlmBase/config/CMakeLists.txt b/IlmBase/config/CMakeLists.txt -index 508176a..9e6ab91 100644 ---- a/IlmBase/config/CMakeLists.txt -+++ b/IlmBase/config/CMakeLists.txt -@@ -71,9 +71,9 @@ if(ILMBASE_INSTALL_PKG_CONFIG) - # use a helper function to avoid variable pollution, but pretty simple - function(ilmbase_pkg_config_help pcinfile) - set(prefix ${CMAKE_INSTALL_PREFIX}) -- set(exec_prefix ${CMAKE_INSTALL_BINDIR}) -- set(libdir ${CMAKE_INSTALL_LIBDIR}) -- set(includedir ${CMAKE_INSTALL_INCLUDEDIR}) -+ set(exec_prefix ${CMAKE_INSTALL_FULL_BINDIR}) -+ set(libdir ${CMAKE_INSTALL_FULL_LIBDIR}) -+ set(includedir ${CMAKE_INSTALL_FULL_INCLUDEDIR}) - set(LIB_SUFFIX_DASH ${ILMBASE_LIB_SUFFIX}) - if(TARGET Threads::Threads) - # hrm, can't use properties as they end up as generator expressions -diff --git a/OpenEXR/config/CMakeLists.txt b/OpenEXR/config/CMakeLists.txt -index 1ef829a..b8dc141 100644 ---- a/OpenEXR/config/CMakeLists.txt -+++ b/OpenEXR/config/CMakeLists.txt -@@ -72,9 +72,9 @@ if(OPENEXR_INSTALL_PKG_CONFIG) - # use a helper function to avoid variable pollution, but pretty simple - function(openexr_pkg_config_help pcinfile) - set(prefix ${CMAKE_INSTALL_PREFIX}) -- set(exec_prefix ${CMAKE_INSTALL_BINDIR}) -- set(libdir ${CMAKE_INSTALL_LIBDIR}) -- set(includedir ${CMAKE_INSTALL_INCLUDEDIR}) -+ set(exec_prefix ${CMAKE_INSTALL_FULL_BINDIR}) -+ set(libdir ${CMAKE_INSTALL_FULL_LIBDIR}) -+ set(includedir ${CMAKE_INSTALL_FULL_INCLUDEDIR}) - set(LIB_SUFFIX_DASH ${OPENEXR_LIB_SUFFIX}) - if(TARGET Threads::Threads) - # hrm, can't use properties as they end up as generator expressions - |