#476 patch2.5 - fix sip-build

vscentrum · Jan 14, 2025 · efff749 · efff749
1 parent 4a7dcba
commit efff749
Show file tree

Hide file tree

Showing 9 changed files with 45,172 additions and 55 deletions.
diff --git a/476_QGIS/log9.txt b/476_QGIS/log9.txt
diff --git a/476_QGIS/patch2-SIPmacros/SIPMacros.cmake b/476_QGIS/patch2-SIPmacros/SIPMacros.cmake
@@ -101,7 +101,7 @@ MACRO(GENERATE_SIP_PYTHON_MODULE_CODE MODULE_NAME MODULE_SIP SIP_FILES CPP_FILES
       ENDIF( ${CONCAT_NUM} LESS ${SIP_CONCAT_PARTS} )
     ENDFOREACH(CONCAT_NUM RANGE 0 ${SIP_CONCAT_PARTS} )
 
-    SET(SIPCMD ${SIP_BUILD_EXECUTABLE} --no-protected-is-public --pep484-pyi --no-make --concatenate=${SIP_CONCAT_PARTS} --qmake=${QMAKE_EXECUTABLE} --include-dir=${CMAKE_CURRENT_BINARY_DIR} --include-dir=${PYQT_SIP_DIR} --include-dir=${QSCI_SIP_DIR} --api-dir ${CMAKE_BINARY_DIR}/python ${SIP_BUILD_EXTRA_OPTIONS})
+    SET(SIPCMD ${SIP_BUILD_EXECUTABLE} --no-protected-is-public --pep484-pyi --no-make --concatenate=${SIP_CONCAT_PARTS} --qmake=${QMAKE_EXECUTABLE} --include-dir=${CMAKE_CURRENT_BINARY_DIR} --include-dir=${PYQT_SIP_DIR} --include-dir=$ENV{EBROOTQSCINTILLA}/share/sip --api-dir ${CMAKE_BINARY_DIR}/python ${SIP_BUILD_EXTRA_OPTIONS})
 
     ADD_CUSTOM_COMMAND(
       OUTPUT ${_sip_output_files}
@@ -140,7 +140,7 @@ MACRO(GENERATE_SIP_PYTHON_MODULE_CODE MODULE_NAME MODULE_SIP SIP_FILES CPP_FILES
       ENDIF( ${CONCAT_NUM} LESS ${SIP_CONCAT_PARTS} )
     ENDFOREACH(CONCAT_NUM RANGE 0 ${SIP_CONCAT_PARTS} )
 
-    SET(SIPCMD ${SIP_BINARY_PATH} ${_sip_tags} -w -e ${_sip_x} ${SIP_EXTRA_OPTIONS} -j ${SIP_CONCAT_PARTS} -c ${CMAKE_CURRENT_BINARY_DIR}/${_module_path} -I ${CMAKE_CURRENT_BINARY_DIR}/${_module_path} ${_sip_includes} -I$ENV{EBROOTPYQT5}/share/sip/PyQt5 -I$ENV{EBROOTQSCINTILLA}/sip ${_configured_module_sip})
+    SET(SIPCMD ${SIP_BINARY_PATH} ${_sip_tags} -w -e ${_sip_x} ${SIP_EXTRA_OPTIONS} -j ${SIP_CONCAT_PARTS} -c ${CMAKE_CURRENT_BINARY_DIR}/${_module_path} -I ${CMAKE_CURRENT_BINARY_DIR}/${_module_path} ${_sip_includes} -I$ENV{EBROOTPYQT5}/share/sip/PyQt5 -I$ENV{EBROOTQSCINTILLA}/share/sip ${_configured_module_sip})
     ADD_CUSTOM_COMMAND(
       OUTPUT ${_sip_output_files}
       COMMAND ${CMAKE_COMMAND} -E echo ${message}

diff --git a/476_QGIS/patch2.4_fix-SIP-macro.patch → ...h2-SIPmacros/patch2.5_fix-SIP-macro.patch b/476_QGIS/patch2.4_fix-SIP-macro.patch → ...h2-SIPmacros/patch2.5_fix-SIP-macro.patch
@@ -3,13 +3,13 @@ include location of PyQt and Qsci .sip files in SIPCMD macro
 author: Kenneth Hoste (HPC-UGent)
 author: Pavel Grochal, Pavel Tománek (INUITS)
 --- cmake/SIPMacros.cmake.orig	2025-01-10 18:04:46.647020000 +0100
-+++ cmake/SIPMacros.cmake	2025-01-14 11:47:39.386644000 +0100
++++ cmake/SIPMacros.cmake	2025-01-14 12:55:47.893234000 +0100
 @@ -101,7 +101,7 @@
        ENDIF( ${CONCAT_NUM} LESS ${SIP_CONCAT_PARTS} )
      ENDFOREACH(CONCAT_NUM RANGE 0 ${SIP_CONCAT_PARTS} )
 
 -    SET(SIPCMD ${SIP_BUILD_EXECUTABLE} --no-protected-is-public --pep484-pyi --no-make --concatenate=${SIP_CONCAT_PARTS} --qmake=${QMAKE_EXECUTABLE} --include-dir=${CMAKE_CURRENT_BINARY_DIR} --include-dir=${PYQT_SIP_DIR} --api-dir ${CMAKE_BINARY_DIR}/python ${SIP_BUILD_EXTRA_OPTIONS})
-+    SET(SIPCMD ${SIP_BUILD_EXECUTABLE} --no-protected-is-public --pep484-pyi --no-make --concatenate=${SIP_CONCAT_PARTS} --qmake=${QMAKE_EXECUTABLE} --include-dir=${CMAKE_CURRENT_BINARY_DIR} --include-dir=${PYQT_SIP_DIR} --include-dir=${QSCI_SIP_DIR} --api-dir ${CMAKE_BINARY_DIR}/python ${SIP_BUILD_EXTRA_OPTIONS})
++    SET(SIPCMD ${SIP_BUILD_EXECUTABLE} --no-protected-is-public --pep484-pyi --no-make --concatenate=${SIP_CONCAT_PARTS} --qmake=${QMAKE_EXECUTABLE} --include-dir=${CMAKE_CURRENT_BINARY_DIR} --include-dir=${PYQT_SIP_DIR} --include-dir=$ENV{EBROOTQSCINTILLA}/share/sip --api-dir ${CMAKE_BINARY_DIR}/python ${SIP_BUILD_EXTRA_OPTIONS})
 
      ADD_CUSTOM_COMMAND(
        OUTPUT ${_sip_output_files}
@@ -18,7 +18,7 @@ author: Pavel Grochal, Pavel Tománek (INUITS)
      ENDFOREACH(CONCAT_NUM RANGE 0 ${SIP_CONCAT_PARTS} )
 
 -    SET(SIPCMD ${SIP_BINARY_PATH} ${_sip_tags} -w -e ${_sip_x} ${SIP_EXTRA_OPTIONS} -j ${SIP_CONCAT_PARTS} -c ${CMAKE_CURRENT_BINARY_DIR}/${_module_path} -I ${CMAKE_CURRENT_BINARY_DIR}/${_module_path} ${_sip_includes} ${_configured_module_sip})
-+    SET(SIPCMD ${SIP_BINARY_PATH} ${_sip_tags} -w -e ${_sip_x} ${SIP_EXTRA_OPTIONS} -j ${SIP_CONCAT_PARTS} -c ${CMAKE_CURRENT_BINARY_DIR}/${_module_path} -I ${CMAKE_CURRENT_BINARY_DIR}/${_module_path} ${_sip_includes} -I$ENV{EBROOTPYQT5}/share/sip/PyQt5 -I$ENV{EBROOTQSCINTILLA}/sip ${_configured_module_sip})
++    SET(SIPCMD ${SIP_BINARY_PATH} ${_sip_tags} -w -e ${_sip_x} ${SIP_EXTRA_OPTIONS} -j ${SIP_CONCAT_PARTS} -c ${CMAKE_CURRENT_BINARY_DIR}/${_module_path} -I ${CMAKE_CURRENT_BINARY_DIR}/${_module_path} ${_sip_includes} -I$ENV{EBROOTPYQT5}/share/sip/PyQt5 -I$ENV{EBROOTQSCINTILLA}/share/sip ${_configured_module_sip})
      ADD_CUSTOM_COMMAND(
        OUTPUT ${_sip_output_files}
        COMMAND ${CMAKE_COMMAND} -E echo ${message}
diff --git a/476_QGIS/patch2.1_fix-SIP-macro.patch b/476_QGIS/patch2.1_fix-SIP-macro.patch
diff --git a/476_QGIS/patch2.2_fix-SIP-macro.patch b/476_QGIS/patch2.2_fix-SIP-macro.patch
diff --git a/476_QGIS/patch2.3_fix-SIP-macro.patch b/476_QGIS/patch2.3_fix-SIP-macro.patch
diff --git a/476_QGIS/patch2.5_fix-SIP-macro.patch b/476_QGIS/patch2.5_fix-SIP-macro.patch
@@ -0,0 +1,24 @@
+include location of PyQt and Qsci .sip files in SIPCMD macro
+
+author: Kenneth Hoste (HPC-UGent)
+author: Pavel Grochal, Pavel Tománek (INUITS)
+--- cmake/SIPMacros.cmake.orig	2025-01-10 18:04:46.647020000 +0100
++++ cmake/SIPMacros.cmake	2025-01-14 12:55:47.893234000 +0100
+@@ -101,7 +101,7 @@
+       ENDIF( ${CONCAT_NUM} LESS ${SIP_CONCAT_PARTS} )
+     ENDFOREACH(CONCAT_NUM RANGE 0 ${SIP_CONCAT_PARTS} )
+
+-    SET(SIPCMD ${SIP_BUILD_EXECUTABLE} --no-protected-is-public --pep484-pyi --no-make --concatenate=${SIP_CONCAT_PARTS} --qmake=${QMAKE_EXECUTABLE} --include-dir=${CMAKE_CURRENT_BINARY_DIR} --include-dir=${PYQT_SIP_DIR} --api-dir ${CMAKE_BINARY_DIR}/python ${SIP_BUILD_EXTRA_OPTIONS})
++    SET(SIPCMD ${SIP_BUILD_EXECUTABLE} --no-protected-is-public --pep484-pyi --no-make --concatenate=${SIP_CONCAT_PARTS} --qmake=${QMAKE_EXECUTABLE} --include-dir=${CMAKE_CURRENT_BINARY_DIR} --include-dir=${PYQT_SIP_DIR} --include-dir=$ENV{EBROOTQSCINTILLA}/share/sip --api-dir ${CMAKE_BINARY_DIR}/python ${SIP_BUILD_EXTRA_OPTIONS})
+
+     ADD_CUSTOM_COMMAND(
+       OUTPUT ${_sip_output_files}
+@@ -140,7 +140,7 @@
+       ENDIF( ${CONCAT_NUM} LESS ${SIP_CONCAT_PARTS} )
+     ENDFOREACH(CONCAT_NUM RANGE 0 ${SIP_CONCAT_PARTS} )
+
+-    SET(SIPCMD ${SIP_BINARY_PATH} ${_sip_tags} -w -e ${_sip_x} ${SIP_EXTRA_OPTIONS} -j ${SIP_CONCAT_PARTS} -c ${CMAKE_CURRENT_BINARY_DIR}/${_module_path} -I ${CMAKE_CURRENT_BINARY_DIR}/${_module_path} ${_sip_includes} ${_configured_module_sip})
++    SET(SIPCMD ${SIP_BINARY_PATH} ${_sip_tags} -w -e ${_sip_x} ${SIP_EXTRA_OPTIONS} -j ${SIP_CONCAT_PARTS} -c ${CMAKE_CURRENT_BINARY_DIR}/${_module_path} -I ${CMAKE_CURRENT_BINARY_DIR}/${_module_path} ${_sip_includes} -I$ENV{EBROOTPYQT5}/share/sip/PyQt5 -I$ENV{EBROOTQSCINTILLA}/share/sip ${_configured_module_sip})
+     ADD_CUSTOM_COMMAND(
+       OUTPUT ${_sip_output_files}
+       COMMAND ${CMAKE_COMMAND} -E echo ${message}
diff --git a/476_QGIS/qgis-3.40.2.eb b/476_QGIS/qgis-3.40.2.eb
@@ -15,7 +15,7 @@ toolchain = {'name': 'foss', 'version': '2023a'}
 
 source_urls = ['http://qgis.org/downloads/']
 sources = [SOURCELOWER_TAR_BZ2]
-patches = ['patch2.4_fix-SIP-macro.patch']
+patches = ['patch2.5_fix-SIP-macro.patch']
 checksums = [
     {'qgis-3.40.2.tar.bz2': '3eddc2cb93f339dabb4c90d94ea31d5d1845c21542e8317ec2cbe3e95d124b9a'},
     {'patch2.4_fix-SIP-macro.patch': 'ad8d90256d2b252764127a04bc6948042c4b83a0d98ad7c0ba8d6d9ce0915c95'},
@@ -90,7 +90,9 @@ configopts = ' '.join(_copts)
 moduleclass = 'geo'
 
 # E7:
-    # -> update patch2.4
+    # -> update patch2.5
+    # -> update patch2.4 -> failed log9.txt -> wrong --include-dir - 2x PyQt and no Qsci
+        # cd /tmp/vsc47063/easybuild/build/QGIS/3.40.2/foss-2023a/easybuild_obj/python/gui && /apps/gent/RHEL8/cascadelake-ib/software/SIP/6.8.1-GCCcore-12.3.0/bin/sip-build --no-protected-is-public --pep484-pyi --no-make --concatenate=25 --qmake=/apps/gent/RHEL8/cascadelake-ib/software/Qt5/5.15.10-GCCcore-12.3.0/bin/qmake --include-dir=/tmp/vsc47063/easybuild/build/QGIS/3.40.2/foss-2023a/easybuild_obj/python --include-dir=/apps/gent/RHEL8/cascadelake-ib/software/PyQt5/5.15.10-GCCcore-12.3.0/lib/python3.11/site-packages/PyQt5/bindings --include-dir=/apps/gent/RHEL8/cascadelake-ib/software/PyQt5/5.15.10-GCCcore-12.3.0/lib/python3.11/site-packages/PyQt5/bindings --api-dir /tmp/vsc47063/easybuild/build/QGIS/3.40.2/foss-2023a/easybuild_obj/python
     # <- build failed <- log8.txt
         # sip-build: /tmp/vsc47063/easybuild/build/QGIS/3.40.2/foss-2023a/easybuild_obj/
         #  python/gui/gui.sip: line 15: column 9: 'Qsci/qscimod5.sip' could not be found

diff --git a/476_QGIS/qgis_v2-CMNinja.eb b/476_QGIS/qgis_v2-CMNinja.eb
@@ -15,9 +15,11 @@ toolchain = {'name': 'foss', 'version': '2023a'}
 
 source_urls = ['http://qgis.org/downloads/']
 sources = [SOURCELOWER_TAR_BZ2]
-checksums = ['d72d07a39729d97d8d3f536301819a4ca9c2c00f9f396e9022a5ec4356d828bf']
-
-patches = ['patch2.3_fix-SIP-macro.patch']
+patches = ['patch2.5_fix-SIP-macro.patch']
+checksums = [
+    {'qgis-3.38.3.tar.bz2': 'd72d07a39729d97d8d3f536301819a4ca9c2c00f9f396e9022a5ec4356d828bf'},
+    {'patch2.5_fix-SIP-macro.patch': 'd8094ff803a6918843568d9561610f770ebd159b1d63b27ec863ce698857410f'},
+]
 
 builddependencies = [
     ('flex', '2.6.4'),
@@ -90,6 +92,7 @@ configopts = ' '.join(_copts)
 moduleclass = 'geo'
 
 # E1: 
+    # -> update patch2.5 (E7 in qgis-3.40.2)
     # -> update patch2 to see sip files in qsci -> still same error
         # 9942/11440] Generating gui/build/_gui/sip_guipart0.cpp, gui/build/_gui/sip_guipart1.cpp, gui/build/_gui/sip_guipart2.cpp, gui/build/_gui/sip_guipart3.cpp, gui/build/_gui/sip_guipart4.cpp, gui/build/_gui/sip_guipart5.cpp, gui/build/_gui/sip_guipart6.cpp, gui/build/_gui/sip_guipart7.cpp, gui/build/_gui/sip_guipart8.cpp, gui/build/_gui/sip_guipart9.cpp, gui/build/_gui/sip_guipart10.cpp, gui/build/_gui/sip_guipart11.cpp, gui/build/_gui/sip_guipart12.cpp, gui/build/_gui/sip_guipart13.cpp, gui/build/_gui/sip_guipart14.cpp, gui/build/_gui/sip_guipart15.cpp, gui/build/_gui/sip_guipart16.cpp, gui/build/_gui/sip_guipart17.cpp, gui/build/_gui/sip_guipart18.cpp, gui/build/_gui/sip_guipart19.cpp, gui/build/_gui/sip_guipart20.cpp, gui/build/_gui/sip_guipart21.cpp
         # FAILED: python/gui/build/_gui/sip_guipart0.cpp python/gui/build/_gui/sip_guipart1.cpp python/gui/build/_gui/sip_guipart2.cpp python/gui/build/_gui/sip_guipart3.cpp python/gui/build/_gui/sip_guipart4.cpp python/gui/build/_gui/sip_guipart5.cpp python/gui/build/_gui/sip_guipart6.cpp python/gui/build/_gui/sip_guipart7.cpp python/gui/build/_gui/sip_guipart8.cpp python/gui/build/_gui/sip_guipart9.cpp python/gui/build/_gui/sip_guipart10.cpp python/gui/build/_gui/sip_guipart11.cpp python/gui/build/_gui/sip_guipart12.cpp python/gui/build/_gui/sip_guipart13.cpp python/gui/build/_gui/sip_guipart14.cpp python/gui/build/_gui/sip_guipart15.cpp python/gui/build/_gui/sip_guipart16.cpp python/gui/build/_gui/sip_guipart17.cpp python/gui/build/_gui/sip_guipart18.cpp python/gui/build/_gui/sip_guipart19.cpp python/gui/build/_gui/sip_guipart20.cpp python/gui/build/_gui/sip_guipart21.cpp /tmp/vsc47063/easybuild/build/QGIS/3.38.3/foss-2023a/easybuild_obj/python/gui/build/_gui/sip_guipart0.cpp /tmp/vsc47063/easybuild/build/QGIS/3.38.3/foss-2023a/easybuild_obj/python/gui/build/_gui/sip_guipart1.cpp /tmp/vsc47063/easybuild/build/QGIS/3.38.3/foss-2023a/easybuild_obj/python/gui/build/_gui/sip_guipart2.cpp /tmp/vsc47063/easybuild/build/QGIS/3.38.3/foss-2023a/easybuild_obj/python/gui/build/_gui/sip_guipart3.cpp /tmp/vsc47063/easybuild/build/QGIS/3.38.3/foss-2023a/easybuild_obj/python/gui/build/_gui/sip_guipart4.cpp /tmp/vsc47063/easybuild/build/QGIS/3.38.3/foss-2023a/easybuild_obj/python/gui/build/_gui/sip_guipart5.cpp /tmp/vsc47063/easybuild/build/QGIS/3.38.3/foss-2023a/easybuild_obj/python/gui/build/_gui/sip_guipart6.cpp /tmp/vsc47063/easybuild/build/QGIS/3.38.3/foss-2023a/easybuild_obj/python/gui/build/_gui/sip_guipart7.cpp /tmp/vsc47063/easybuild/build/QGIS/3.38.3/foss-2023a/easybuild_obj/python/gui/build/_gui/sip_guipart8.cpp /tmp/vsc47063/easybuild/build/QGIS/3.38.3/foss-2023a/easybuild_obj/python/gui/build/_gui/sip_guipart9.cpp /tmp/vsc47063/easybuild/build/QGIS/3.38.3/foss-2023a/easybuild_obj/python/gui/build/_gui/sip_guipart10.cpp /tmp/vsc47063/easybuild/build/QGIS/3.38.3/foss-2023a/easybuild_obj/python/gui/build/_gui/sip_guipart11.cpp /tmp/vsc47063/easybuild/build/QGIS/3.38.3/foss-2023a/easybuild_obj/python/gui/build/_gui/sip_guipart12.cpp /tmp/vsc47063/easybuild/build/QGIS/3.38.3/foss-2023a/easybuild_obj/python/gui/build/_gui/sip_guipart13.cpp /tmp/vsc47063/easybuild/build/QGIS/3.38.3/foss-2023a/easybuild_obj/python/gui/build/_gui/sip_guipart14.cpp /tmp/vsc47063/easybuild/build/QGIS/3.38.3/foss-2023a/easybuild_obj/python/gui/build/_gui/sip_guipart15.cpp /tmp/vsc47063/easybuild/build/QGIS/3.38.3/foss-2023a/easybuild_obj/python/gui/build/_gui/sip_guipart16.cpp /tmp/vsc47063/easybuild/build/QGIS/3.38.3/foss-2023a/easybuild_obj/python/gui/build/_gui/sip_guipart17.cpp /tmp/vsc47063/easybuild/build/QGIS/3.38.3/foss-2023a/easybuild_obj/python/gui/build/_gui/sip_guipart18.cpp /tmp/vsc47063/easybuild/build/QGIS/3.38.3/foss-2023a/easybuild_obj/python/gui/build/_gui/sip_guipart19.cpp /tmp/vsc47063/easybuild/build/QGIS/3.38.3/foss-2023a/easybuild_obj/python/gui/build/_gui/sip_guipart20.cpp /tmp/vsc47063/easybuild/build/QGIS/3.38.3/foss-2023a/easybuild_obj/python/gui/build/_gui/sip_guipart21.cpp