[Git][debian-gis-team/jeolib-jiplib][master] 2 commits: Use cmake buildsystem for parallel builds.

[Bas Couwenberg (@sebastic)]

Bas Couwenberg pushed to branch master at Debian GIS Project / jeolib-jiplib


Commits:
345b8bd6 by Bas Couwenberg at 2025-10-26T07:44:53+01:00
Use cmake buildsystem for parallel builds.

- - - - -
14b4dc35 by Bas Couwenberg at 2025-10-26T08:03:57+01:00
Set distribution to unstable.

- - - - -


5 changed files:

- debian/changelog
- debian/patches/libdir.patch
- debian/patches/pip-break-sys-pkg.patch
- debian/patches/wheel.patch
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,4 +1,4 @@
-jeolib-jiplib (1.1.6+ds-2) UNRELEASED; urgency=medium
+jeolib-jiplib (1.1.6+ds-2) unstable; urgency=medium
 
   * Team upload.
   * Ignore test failures everywhere except amd64.
@@ -6,8 +6,9 @@ jeolib-jiplib (1.1.6+ds-2) UNRELEASED; urgency=medium
   * Use test-build-validate-cleanup instead of test-build-twice.
   * Add patch to fix library installation path.
   * Add patch to fix wheel build (requires --no-build-isolation)
+  * Use cmake buildsystem for parallel builds.
 
- -- Bas Couwenberg <sebastic at debian.org>  Sat, 25 Oct 2025 11:42:21 +0200
+ -- Bas Couwenberg <sebastic at debian.org>  Sun, 26 Oct 2025 08:03:45 +0100
 
 jeolib-jiplib (1.1.6+ds-1) unstable; urgency=medium
 


=====================================
debian/patches/libdir.patch
=====================================
@@ -21,7 +21,7 @@ Forwarded: https://github.com/ec-jrc/jeolib-jiplib/pull/8
 +        DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
  )
  INSTALL(CODE
-   "execute_process(COMMAND ${Python_EXECUTABLE} -m pip install --root-user-action ignore --prefix usr --verbose --break-system-packages ${_pip_args} ${CMAKE_CURRENT_BINARY_DIR}/jiplib-${JIPLIB_VERSION}-py3-none-any.whl --force-reinstall)"
+   "execute_process(COMMAND ${Python_EXECUTABLE} -m pip install --root-user-action ignore --root ${CMAKE_CURRENT_SOURCE_DIR}/debian/tmp --verbose --break-system-packages ${_pip_args} ${CMAKE_CURRENT_BINARY_DIR}/jiplib-${JIPLIB_VERSION}-py3-none-any.whl --force-reinstall)"
 --- a/cmake.pc.in
 +++ b/cmake.pc.in
 @@ -1,6 +1,6 @@


=====================================
debian/patches/pip-break-sys-pkg.patch
=====================================
@@ -9,6 +9,6 @@ Forwarded: not-needed
  )
  INSTALL(CODE
 -  "execute_process(COMMAND ${Python_EXECUTABLE} -m pip install ${_pip_args} ${CMAKE_CURRENT_BINARY_DIR}/jiplib-${JIPLIB_VERSION}-py3-none-any.whl --force-reinstall)"
-+  "execute_process(COMMAND ${Python_EXECUTABLE} -m pip install --root-user-action ignore --prefix usr --verbose --break-system-packages ${_pip_args} ${CMAKE_CURRENT_BINARY_DIR}/jiplib-${JIPLIB_VERSION}-py3-none-any.whl --force-reinstall)"
++  "execute_process(COMMAND ${Python_EXECUTABLE} -m pip install --root-user-action ignore --root ${CMAKE_CURRENT_SOURCE_DIR}/debian/tmp --verbose --break-system-packages ${_pip_args} ${CMAKE_CURRENT_BINARY_DIR}/jiplib-${JIPLIB_VERSION}-py3-none-any.whl --force-reinstall)"
    COMPONENT wheels
    )


=====================================
debian/patches/wheel.patch
=====================================
@@ -4,8 +4,12 @@ Forwarded: not-needed
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -680,7 +680,7 @@ if(BUILD_WITH_PYTHON)
-       COMMAND cp ${MIALLIB_LIBRARIES}.${MIALLIB_VERSION_MAJOR} ${WHEEL_DIR}
+@@ -676,11 +676,9 @@ if(BUILD_WITH_PYTHON)
+       COMMAND cp ${PYTHON_SOURCE_DIR}/setup.py ${CMAKE_CURRENT_BINARY_DIR}
+       COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/README.md ${WHEEL_DIR}
+       COMMAND cp ${CMAKE_BINARY_DIR}/_${JIPLIB_LIB_NAME}.so ${WHEEL_DIR}
+-      COMMAND cp ${CMAKE_BINARY_DIR}/lib${JIPLIB_LIB_NAME}.so.${JIPLIB_VERSION_MAJOR} ${WHEEL_DIR}
+-      COMMAND cp ${MIALLIB_LIBRARIES}.${MIALLIB_VERSION_MAJOR} ${WHEEL_DIR}
        COMMAND cp ${CMAKE_BINARY_DIR}/${JIPLIB_LIB_NAME}.py ${WHEEL_DIR}
        COMMAND cp ${PROJECT_SOURCE_DIR}/README.md ${WHEEL_DIR}
 -      COMMAND ${Python_EXECUTABLE} -m pip wheel ${CMAKE_CURRENT_BINARY_DIR}


=====================================
debian/rules
=====================================
@@ -6,22 +6,20 @@
 # Enable hardening build flags
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
+export DEB_PYTHON_INSTALL_LAYOUT=deb_system
+
 include /usr/share/dpkg/architecture.mk
 
 %:
-	dh $@ --buildsystem=pybuild
+	dh $@ --buildsystem=cmake --builddir=build
 
 override_dh_auto_test:
 # Ignore test failures on problematic architectures only
 ifeq (,$(filter $(DEB_BUILD_ARCH),amd64))
-	dh_auto_test || echo "Ignoring test failures"
+	PYTHONPATH=$(CURDIR)/build dh_auto_test || echo "Ignoring test failures"
 else
-	dh_auto_test
+	PYTHONPATH=$(CURDIR)/build dh_auto_test
 endif
 
 execute_after_dh_auto_install:
-	mkdir -p debian/tmp/usr/lib/python3
-	find $(CURDIR)/.pybuild/*/build/usr/ -name 'libmiallib.so.*' -delete
-	find $(CURDIR)/.pybuild/*/build/usr/ -name 'libjiplib.so.*' -delete
-	mv $(CURDIR)/.pybuild/*/build/usr/lib/python*/* debian/tmp/usr/lib/python3/.
 	find $(CURDIR)/debian/tmp -name '*.so*' -exec chrpath -d {} \;



View it on GitLab: https://salsa.debian.org/debian-gis-team/jeolib-jiplib/-/compare/e2c34ea1eff3c125e267cf85385ca54f04a6469e...14b4dc35a2692368a511d22bed5cd1e666cbbc70

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/jeolib-jiplib/-/compare/e2c34ea1eff3c125e267cf85385ca54f04a6469e...14b4dc35a2692368a511d22bed5cd1e666cbbc70
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20251026/df7eca6c/attachment-0001.htm>