[med-svn] [Git][med-team/acedb][master] 3 commits: Build against glibc 2.38

[Andreas Tille (@tille)]

Andreas Tille pushed to branch master at Debian Med / acedb


Commits:
4d1aa983 by Andreas Tille at 2023-11-24T19:46:45+01:00
Build against glibc 2.38

- - - - -
1bd28677 by Andreas Tille at 2023-11-24T19:47:43+01:00
Rely on pre-initialized dpkg-architecture variables.

Changes-By: lintian-brush

- - - - -
f89fdce4 by Andreas Tille at 2023-11-24T19:49:34+01:00
routine-update: Ready to upload to unstable

- - - - -


4 changed files:

- debian/changelog
- + debian/patches/glibc2.38.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,14 @@
+acedb (4.9.39+dfsg.02-9) unstable; urgency=medium
+
+  [ Olivier Gayot ]
+  * Build against glibc 2.38
+    Closes: #1056591 (LP: #2044385)
+
+  [ Andreas Tille ]
+  Rely on pre-initialized dpkg-architecture variables.
+
+ -- Andreas Tille <tille at debian.org>  Fri, 24 Nov 2023 19:48:00 +0100
+
 acedb (4.9.39+dfsg.02-8) unstable; urgency=medium
 
   [ Étienne Mollier ]


=====================================
debian/patches/glibc2.38.patch
=====================================
@@ -0,0 +1,47 @@
+Description: Fix build against glibc 2.38
+ In previous glibc versions, strcasestr would only be available if building
+ with _GNU_SOURCE.
+ Starting with glibc 2.38, strcasestr is now available by default.
+ Ensure that acedb does not redefine the function if we're building with a modern glibc.
+Author: Olivier Gayot <olivier.gayot at canonical.com>
+Bug: https://bugs.debian.org/1056591
+Bug-Ubuntu: https://launchpad.net/bugs/2044385
+Forwarded: no
+Last-Update: 2023-11-23
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: acedb-4.9.39+dfsg.02/w1/utils.c
+===================================================================
+--- acedb-4.9.39+dfsg.02.orig/w1/utils.c	2005-10-04 15:15:00.000000000 +0200
++++ acedb-4.9.39+dfsg.02/w1/utils.c	2023-11-23 16:48:20.118800952 +0100
+@@ -774,7 +774,7 @@
+ /************************************************************/
+ /* case-insensitive version of strstr */
+ 
+-#ifndef DARWIN
++#ifndef HAS_STRCASESTR
+ char *strcasestr(char *str1, char *str2)
+ {
+   g_strup(str1);
+Index: acedb-4.9.39+dfsg.02/wh/utils.h
+===================================================================
+--- acedb-4.9.39+dfsg.02.orig/wh/utils.h	2023-11-23 16:19:02.454527757 +0100
++++ acedb-4.9.39+dfsg.02/wh/utils.h	2023-11-23 16:47:40.099066905 +0100
+@@ -29,7 +29,16 @@
+  *-------------------------------------------------------------------
+  */
+ 
+-#ifndef DARWIN
++/* Ensure that features.h or an equivalent is included. */ 
++#include <stdlib.h>
++
++#if defined(DARWIN) || defined(_GNU_SOURCE)
++# define HAS_STRCASESTR
++#elif __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 38
++# define HAS_STRCASESTR
++#endif
++
++#ifndef HAS_STRCASESTR
+ /* case-insensitive version of strstr */
+ char *strcasestr      (char *str1, char *str2);
+ #endif


=====================================
debian/patches/series
=====================================
@@ -12,3 +12,4 @@ no_dotter_and_belvu.patch
 libfl.patch
 glibc2.32.patch
 just_build_efetch.patch
+glibc2.38.patch


=====================================
debian/rules
=====================================
@@ -11,9 +11,7 @@ export DEB_LDFLAGS_MAINT_APPEND = -ltirpc
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
-DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_BUILD_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU)
+include /usr/share/dpkg/architecture.mk
 
 ifneq (,$(filter $(DEB_HOST_ARCH_CPU), amd64 alpha ia64 s390x ppc64 sparc64))
 export ACEDB_MACHINE=LINUX_4



View it on GitLab: https://salsa.debian.org/med-team/acedb/-/compare/fac094489b2127aa8ec38e90716df1f666e451df...f89fdce47bd8ae84b87e4f2b160623a3ed8761ab

-- 
View it on GitLab: https://salsa.debian.org/med-team/acedb/-/compare/fac094489b2127aa8ec38e90716df1f666e451df...f89fdce47bd8ae84b87e4f2b160623a3ed8761ab
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/20231124/36c4402c/attachment-0001.htm>