[Git][debian-gis-team/jeolib-jiplib][master] Add patch to fix library installation path.

[Bas Couwenberg (@sebastic)]

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


Commits:
50e8bb3d by Bas Couwenberg at 2025-10-25T18:23:13+02:00
Add patch to fix library installation path.

- - - - -


5 changed files:

- debian/changelog
- debian/libjiplib-dev.install
- debian/libjiplib1.install
- + debian/patches/libdir.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -3,6 +3,7 @@ jeolib-jiplib (1.1.6+ds-2) UNRELEASED; urgency=medium
   * Ignore test failures everywhere except amd64.
   * Re-enable Salsa CI i386 jobs.
   * Use test-build-validate-cleanup instead of test-build-twice.
+  * Add patch to fix library installation path.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sat, 25 Oct 2025 11:42:21 +0200
 


=====================================
debian/libjiplib-dev.install
=====================================
@@ -1,4 +1,4 @@
 usr/include/jiplib/*.h
-usr/lib/lib*.so        usr/lib/${DEB_HOST_MULTIARCH}
-usr/lib/pkgconfig/*.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig
+usr/lib/*/lib*.so
+usr/lib/*/pkgconfig/*.pc
 usr/lib/*/cmake/jiplib/*.cmake


=====================================
debian/libjiplib1.install
=====================================
@@ -1 +1 @@
-usr/lib/lib*.so.* usr/lib/${DEB_HOST_MULTIARCH}
+usr/lib/*/lib*.so.*


=====================================
debian/patches/libdir.patch
=====================================
@@ -0,0 +1,34 @@
+Description: Use ${CMAKE_INSTALL_LIBDIR} from GNUInstallDirs instead of lib.
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: https://github.com/ec-jrc/jeolib-jiplib/pull/8
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -689,7 +689,7 @@ endif(BUILD_WITH_PYTHON)
+ ########## INSTALL ##########
+ INSTALL(TARGETS ${JIPLIB_LIB_NAME}
+   LIBRARY
+-  DESTINATION lib
++  DESTINATION ${CMAKE_INSTALL_LIBDIR}
+   COMPONENT libraries
+   PUBLIC_HEADER
+   DESTINATION include/${JIPLIB_LIB_NAME}
+@@ -697,7 +697,7 @@ INSTALL(TARGETS ${JIPLIB_LIB_NAME}
+   )
+ 
+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/jiplib.pc
+-        DESTINATION lib/pkgconfig
++        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)"
+--- a/cmake.pc.in
++++ b/cmake.pc.in
+@@ -1,6 +1,6 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=@CMAKE_INSTALL_PREFIX@/bin
+-libdir=@CMAKE_INSTALL_PREFIX@/lib
++libdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@
+ includedir=@CMAKE_INSTALL_PREFIX@/include
+ 
+ Name: jiplib


=====================================
debian/patches/series
=====================================
@@ -1,3 +1,4 @@
 pip-break-sys-pkg.patch
 spelling-errors-take2.patch
 gdal-3.12.patch
+libdir.patch



View it on GitLab: https://salsa.debian.org/debian-gis-team/jeolib-jiplib/-/commit/50e8bb3d9cbd16db618a92899e74f515de980086

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/jeolib-jiplib/-/commit/50e8bb3d9cbd16db618a92899e74f515de980086
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/b800d3e8/attachment-0001.htm>