pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

opencascade-git: Patch to stop attempting to modify files in the install dir.



Module Name:	pkgsrc-wip
Committed By:	Paul Ripke <stix%stix.id.au@localhost>
Pushed By:	stix
Date:		Wed Nov 9 10:40:05 2022 +1100
Changeset:	9424be9493ab07f14272d3c6f3e7e0f2734a5a38

Modified Files:
	opencascade-git/distinfo
Added Files:
	opencascade-git/patches/patch-adm_cmake_occt__macros.cmake

Log Message:
opencascade-git: Patch to stop attempting to modify files in the install dir.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=9424be9493ab07f14272d3c6f3e7e0f2734a5a38

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 opencascade-git/distinfo                                 |  1 +
 .../patches/patch-adm_cmake_occt__macros.cmake           | 16 ++++++++++++++++
 2 files changed, 17 insertions(+)

diffs:
diff --git a/opencascade-git/distinfo b/opencascade-git/distinfo
index ed294c7bd9..633bdacea4 100644
--- a/opencascade-git/distinfo
+++ b/opencascade-git/distinfo
@@ -1,6 +1,7 @@
 $NetBSD$
 
 SHA1 (patch-CMakeLists.txt) = 0aed9c33580f915de7ff0c2800a78d00d655edc4
+SHA1 (patch-adm_cmake_occt__macros.cmake) = 132c73f4208796af25f7363e3792e825887ac3aa
 SHA1 (patch-src_DrawResources_InitEnvironment.tcl) = 436803f7b8f3e72b0c62a8df7a3b76babf9aecaf
 SHA1 (patch-src_OSD_OSD__Chronometer.cxx) = 8df82aefe0fe738534c4ee2c93aa0d542cd75443
 SHA1 (patch-src_OSD_OSD__Host.cxx) = 6f56c0a582c0880e01b8923ef9356acf0a3bf55c
diff --git a/opencascade-git/patches/patch-adm_cmake_occt__macros.cmake b/opencascade-git/patches/patch-adm_cmake_occt__macros.cmake
new file mode 100644
index 0000000000..cddd79a2b0
--- /dev/null
+++ b/opencascade-git/patches/patch-adm_cmake_occt__macros.cmake
@@ -0,0 +1,16 @@
+$NetBSD$
+
+Fix escaping so substitutions occur in the right pass, and we don't try to
+modify files in the final installation directory.
+
+--- adm/cmake/occt_macros.cmake.orig	2022-11-08 12:10:11.124051833 +0000
++++ adm/cmake/occt_macros.cmake
+@@ -592,7 +592,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)
+-  file (GLOB ALL_OCCT_TARGET_FILES \"${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADE*Targets-\${CMAKE_INSTALL_CONFIG_NAME_LOWERCASE}.cmake\")
++  file (GLOB ALL_OCCT_TARGET_FILES \"\${INSTALL_DIR}/\${INSTALL_DIR_CMAKE}/OpenCASCADE*Targets-\${CMAKE_INSTALL_CONFIG_NAME_LOWERCASE}.cmake\")
+   foreach(TARGET_FILENAME \${ALL_OCCT_TARGET_FILES})
+     file (STRINGS \"\${TARGET_FILENAME}\" TARGET_FILE_CONTENT)
+     file (REMOVE \"\${TARGET_FILENAME}\")


Home | Main Index | Thread Index | Old Index