diff options
| author | Kevin Daudt <kdaudt@alpinelinux.org> | 2020-02-23 14:52:55 +0000 |
|---|---|---|
| committer | Kevin Daudt <kdaudt@alpinelinux.org> | 2020-02-23 15:17:35 +0000 |
| commit | 5c80b832e5a732b376d20aabbbb15eb93162a218 (patch) | |
| tree | 8725834ed728ae70a944685c30e5ec469c0827f5 /testing/opencascade | |
| parent | 3f471b06bb5c16653d1741de279486b27859206f (diff) | |
| download | aports-5c80b832e5a732b376d20aabbbb15eb93162a218.tar.bz2 aports-5c80b832e5a732b376d20aabbbb15eb93162a218.tar.xz | |
testing/opencascade: update cmake_fix_install_dir patch
Diffstat (limited to 'testing/opencascade')
| -rw-r--r-- | testing/opencascade/APKBUILD | 2 | ||||
| -rw-r--r-- | testing/opencascade/cmake_fix_install_dir.patch | 17 |
2 files changed, 11 insertions, 8 deletions
diff --git a/testing/opencascade/APKBUILD b/testing/opencascade/APKBUILD index 8e0cf9271b..8ab704591f 100644 --- a/testing/opencascade/APKBUILD +++ b/testing/opencascade/APKBUILD @@ -54,4 +54,4 @@ package() { sha512sums="eb0d47848d48f42a159ae5d7a4144483ba1f59f634844bd2053e48e04af30a30ba7056112cd38a1730d193a8d736b898f9608dd574cbe6829dbe7257a002772a opencascade-7.4.0.tar.gz 01ee778de7ef95a479c87445d1d062e5d858879e211d2c312f801133e35f768cc70d00e3f3fae00f39c60473641c78517d16d63425dd2dd7e19f3079d2cf1a51 no_mallinfo.patch b039b8fce696bfd0f53309a72adab4065780bf1755da6208040157e9383deb0061ad8927a6f160730f431cbebe3fdd1eaa7967b38da4a245a8d9306042d97629 no_feenableexcept.patch -432cd1d1e08d7d27a8d20808cdb67bc976c189d4fa9001576d6cdf3b0891dcf3c91890916ee281b34007ca02a7eed913d33e85b7613e5b77f25892e950217e6a cmake_fix_install_dir.patch" +10481f153adf1db55111d68da49dae1885a50e745d3a978f6316b5b13a3f2d7de6a2ed6a3c60c20ef967ea65c16b372da03bf2665ffe4493ad6fe329a3abf368 cmake_fix_install_dir.patch" diff --git a/testing/opencascade/cmake_fix_install_dir.patch b/testing/opencascade/cmake_fix_install_dir.patch index 12d1d1b697..f7340a97a7 100644 --- a/testing/opencascade/cmake_fix_install_dir.patch +++ b/testing/opencascade/cmake_fix_install_dir.patch @@ -2,9 +2,11 @@ Fixes: > CMake Error at cmake_install.cmake:8340 (configure_file): > configure_file Problem configuring file First posted on Arch Linux ---- occt-V7_1_0/CMakeLists.txt 2016-11-25 11:50:18.000000000 +0100 -+++ occt-V7_1_0.new/CMakeLists.txt 2017-03-18 08:44:10.406668714 +0100 -@@ -906,7 +906,7 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0b445de..1c6a41b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1122,7 +1122,7 @@ foreach (OCCT_CONFIGURATION ${CMAKE_CONFIGURATION_TYPES}) endforeach() # install OpenCASCADE config file with compile definitions and C/C++ flags ONLY for current configuration install (CODE "string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWER)") @@ -13,10 +15,11 @@ First posted on Arch Linux foreach (OCCT_MODULE ${OCCT_MODULES}) if (BUILD_MODULE_${OCCT_MODULE}) -diff -aur occt-V7_1_0/adm/cmake/occt_macros.cmake occt-V7_1_0.new/adm/cmake/occt_macros.cmake ---- occt-V7_1_0/adm/cmake/occt_macros.cmake 2016-11-25 11:50:18.000000000 +0100 -+++ occt-V7_1_0.new/adm/cmake/occt_macros.cmake 2017-03-18 08:44:10.406668714 +0100 -@@ -558,7 +558,7 @@ +diff --git a/adm/cmake/occt_macros.cmake b/adm/cmake/occt_macros.cmake +index 8220ecd..d1ceea6 100644 +--- a/adm/cmake/occt_macros.cmake ++++ b/adm/cmake/occt_macros.cmake +@@ -598,7 +598,7 @@ macro (OCCT_UPDATE_TARGET_FILE) "cmake_policy(PUSH) cmake_policy(SET CMP0007 NEW) string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWERCASE) |