[med-svn] [Git][med-team/fis-gtm][master] Fix FTBFS without libgcrypt-config - thanks a lot for the NMU by Andreas Metzler

[Andreas Tille (@tille)]

Andreas Tille pushed to branch master at Debian Med / fis-gtm


Commits:
383ce196 by Andreas Tille at 2024-06-30T21:50:07+02:00
Fix FTBFS without libgcrypt-config - thanks a lot for the NMU by Andreas Metzler

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/do-not-use_libgcrypt-config.diff
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+fis-gtm (7.0-005-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTBFS without libgcrypt-config by simply dropping the respective code
+    on Debian. libgcrypt headers are installed to /usr/include on Debian
+    Closes: #1071860
+
+ -- Andreas Metzler <ametzler at debian.org>  Sat, 29 Jun 2024 15:41:01 +0200
+
 fis-gtm (7.0-005-2) unstable; urgency=medium
 
   * Build-Depends: s/libgcrypt20-dev | //, pkgconf


=====================================
debian/patches/do-not-use_libgcrypt-config.diff
=====================================
@@ -0,0 +1,50 @@
+Description: Drop unnecessary call to libgcrypt-config
+ libgcrypt-config has been dropped in libgcrypt 1.11, the call here is
+ unnecessary on Debian (headers in /usr/include).
+ .
+ The whole code snippet is a little bit strange since it allows searching for
+ libgcrypt headers in a standard location while requiring that the library
+ itself can be found in a standard location.
+Author: Andreas Metzler <ametzler at debian.org>
+Origin: vendor
+Bug-Debian: https://bugs.debian.org/1071860
+Last-Update: 2024-06-29
+
+--- fis-gtm-7.0-005.orig/CMakeLists.txt
++++ fis-gtm-7.0-005/CMakeLists.txt
+@@ -523,20 +523,21 @@ add_custom_command(
+ add_custom_target(gen_tls_options
+   DEPENDS ${GTM_BINARY_DIR}/gen_tls_options.h ${GTM_BINARY_DIR}/gen_tls_verify_options.h)
+ 
+-# Locate libgcrypt's header files (assumption: all others headers are found in the same location)
+-find_program(LIBGCRYPT_CONFIG_SCRIPT NAMES libgcrypt-config)
+-if (LIBGCRYPT_CONFIG_SCRIPT MATCHES ".+-NOTFOUND")
+-	message(FATAL_ERROR "FATAL: libgcrypt-config not found (${LIBGCRYPT_CONFIG_SCRIPT})")
+-else()
+-	# libgcrypt-config --cflags returns "\n" when the includes are located in the default search path
+-	exec_program(${LIBGCRYPT_CONFIG_SCRIPT} ARGS --cflags RETURN_VALUE _return_VALUE OUTPUT_VARIABLE LIBGCRYPT_CFLAGS)
+-	# If a path is returned, it is preceded by '-I' for use as CFLAG directive
+-	string(REGEX REPLACE "^-I" "" LIBGCRYPT_INCLUDES "${LIBGCRYPT_CFLAGS}")
+-	if (NOT (${LIBGCRYPT_INCLUDES} MATCHES "\n"))
+-		message("INFO: ${LIBGCRYPT_CONFIG_SCRIPT} ${_return_VALUE} '${LIBGCRYPT_INCLUDES}'")
+-		include_directories(${LIBGCRYPT_INCLUDES})
+-	endif()
+-endif()
++# Disabled - Debian's libgcrypt header are installed in standard paths.
++# # Locate libgcrypt's header files (assumption: all others headers are found in the same location)
++# find_program(LIBGCRYPT_CONFIG_SCRIPT NAMES libgcrypt-config)
++# if (LIBGCRYPT_CONFIG_SCRIPT MATCHES ".+-NOTFOUND")
++# 	message(FATAL_ERROR "FATAL: libgcrypt-config not found (${LIBGCRYPT_CONFIG_SCRIPT})")
++# else()
++# 	# libgcrypt-config --cflags returns "\n" when the includes are located in the default search path
++# 	exec_program(${LIBGCRYPT_CONFIG_SCRIPT} ARGS --cflags RETURN_VALUE _return_VALUE OUTPUT_VARIABLE LIBGCRYPT_CFLAGS)
++# 	# If a path is returned, it is preceded by '-I' for use as CFLAG directive
++# 	string(REGEX REPLACE "^-I" "" LIBGCRYPT_INCLUDES "${LIBGCRYPT_CFLAGS}")
++# 	if (NOT (${LIBGCRYPT_INCLUDES} MATCHES "\n"))
++# 		message("INFO: ${LIBGCRYPT_CONFIG_SCRIPT} ${_return_VALUE} '${LIBGCRYPT_INCLUDES}'")
++# 		include_directories(${LIBGCRYPT_INCLUDES})
++# 	endif()
++# endif()
+ 
+ # Building the three encryption libraries could by a loop of some sort, but
+ # manually creating each target is way easier.


=====================================
debian/patches/series
=====================================
@@ -1,2 +1,3 @@
 upstream_disable_autorelink
 upstream_donot_deploy_all_encryption_libs
+do-not-use_libgcrypt-config.diff



View it on GitLab: https://salsa.debian.org/med-team/fis-gtm/-/commit/383ce196e6dbcdaa8119ead42cf2fbb2a5524c6c

-- 
This project does not include diff previews in email notifications.
View it on GitLab: https://salsa.debian.org/med-team/fis-gtm/-/commit/383ce196e6dbcdaa8119ead42cf2fbb2a5524c6c
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/debian-med-commit/attachments/20240630/57f835d2/attachment-0001.htm>