[med-svn] [Git][med-team/gentle][master] Fix FTCBFS: uses mysql_config and the build architecture pkg-config Closes: #1107615

[Andreas Tille (@tille)]

Andreas Tille pushed to branch master at Debian Med / gentle


Commits:
cfd4dc09 by Andreas Tille at 2025-12-09T16:42:10+01:00
Fix FTCBFS: uses mysql_config and the build architecture pkg-config Closes: #1107615

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/cross.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+gentle (1.9.5~alpha2+dfsg1-3) UNRELEASED; urgency=medium
+
+  [ Helmut Grohne ]
+  * Fix FTCBFS: uses mysql_config and the build architecture pkg-config
+    Closes: #1107615
+
+ -- Andreas Tille <tille at debian.org>  Tue, 09 Dec 2025 16:41:25 +0100
+
 gentle (1.9.5~alpha2+dfsg1-2) unstable; urgency=medium
 
   * Team upload


=====================================
debian/patches/cross.patch
=====================================
@@ -0,0 +1,96 @@
+Description: Fix FTCBFS: uses mysql_config and the build architecture pkg-config
+Author: Helmut Grohne <helmut at subdivi.de>
+Bug-Debian: https://bugs.debian.org/1107615
+Last-Update: 2025-06-10
+
+--- gentle-1.9.5~alpha2+dfsg1.orig/configure.ac
++++ gentle-1.9.5~alpha2+dfsg1/configure.ac
+@@ -57,15 +57,13 @@
+ WX_CXXFLAGS="`$WXCONFIG --cxxflags | sed -e 's/-fno-exceptions//'`"
+ WX_LIBS="`$WXCONFIG --libs`"
+ 
+-#TINYXML_CPPFLAGS="`pkg-config --cppflags tinyxml`"
+-TINYXML_CXXFLAGS="`pkg-config --cflags tinyxml`"
+-TINYXML_LIBS="`pkg-config --libs tinyxml`"
++PKG_CHECK_MODULES([TINYXML],[tinyxml])
+ 
+ GTEST_INCLUDE="`pkg-config --cflags gtest`"
+ GTEST_LIBS="`pkg-config --libs gtest`"
+ 
+-CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS $TINYXML_CPPFLAGS"
+-CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS $TINYXML_CXXFLAGS"
++CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS"
++CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS $TINYXML_CFLAGS"
+ LDFLAGS="$LDFLAGS $TINYXML_LIBS"
+ 
+ if [[ "x" != "x$PREFIX" ]]; then
+--- gentle-1.9.5~alpha2+dfsg1.orig/m4/mysql.m4
++++ gentle-1.9.5~alpha2+dfsg1/m4/mysql.m4
+@@ -5,31 +5,51 @@
+ dnl
+ 
+ AC_DEFUN([WITH_MYSQL], [
+-  AC_MSG_CHECKING(for mysql_config executable)
+-
++  MYSQL_ENABLE=auto
+   AC_ARG_WITH(mysql, AS_HELP_STRING([--with-mysql=PATH],[path to mysql_config binary or mysql prefix dir]), [
+-  if test -x $withval -a -f $withval -a "no" != "$withval"
++  if test "$withval" = yes || test "$withval" = no
++  then
++      MYSQL_ENABLE=$withval
++    elif test -x $withval -a -f $withval
+     then
+       MYSQL_CONFIG=$withval
++      MYSQL_ENABLE=mysql_config
+     elif test -x $withval/bin/mysql_config -a -f $withval/bin/mysql_config
+     then
+-     MYSQL_CONFIG=$withval/bin/mysql_config
+-    fi
+-  ], [
+-  if test -x /usr/local/mysql/bin/mysql_config -a -f /usr/local/mysql/bin/mysql_config
+-    then
+-      MYSQL_CONFIG=/usr/local/mysql/bin/mysql_config
+-    elif test -x /usr/bin/mysql_config -a -f /usr/bin/mysql_config
+-    then
+-      MYSQL_CONFIG=/usr/bin/mysql_config
++      MYSQL_CONFIG=$withval/bin/mysql_config
++      MYSQL_ENABLE=mysql_config
+     fi
+   ])
++  AS_IF([test "$MYSQL_ENABLE" = yes || test "$MYSQL_ENABLE" = auto],[
++    PKG_CHECK_MODULES([MYSQLCLIENT],[mysqlclient],[MYSQL_ENABLE=pkg-config],[])
++  ])
++  AC_MSG_CHECKING(for mysql_config executable)
++  AS_IF([test "$MYSQL_ENABLE" = yes || test "$MYSQL_ENABLE" = auto],[
++    if test -x /usr/local/mysql/bin/mysql_config -a -f /usr/local/mysql/bin/mysql_config
++      then
++        MYSQL_CONFIG=/usr/local/mysql/bin/mysql_config
++        MYSQL_ENABLE=mysql_config
++      elif test -x /usr/bin/mysql_config -a -f /usr/bin/mysql_config
++      then
++        MYSQL_CONFIG=/usr/bin/mysql_config
++        MYSQL_CONFIG=mysql_config
++      fi
++  ])
+ 
+-  if test "x$MYSQL_CONFIG" = "x" -o "x$MYSQL_CONFIG" = "xno"
++  if test "$MYSQL_ENABLE=pkg-config"
++  then
++    CXXFLAGS="$CXXFLAGS $MYSQLCLIENT_CFLAGS"
++    LDFLAGS="$LDFLAGS $MYSQLCLIENT_LIBS"
++
++    AC_MSG_RESULT(found via pkg-config)
++  elif test "$MYSQL_ENABLE" = yes
++  then
++    AC_MSG_ERROR(no)
++  elif test "$MYSQL_ENABLE" = auto
++  then
++    AC_MSG_RESULT(no)
++  elif test "$MYSQL_ENABLE" = mysql_config
+   then
+-    AC_MSG_RESULT("MySQL support not configured.")
+-    #exit 3
+-  else
+     AC_PROG_CC
+     AC_PROG_CXX
+ 


=====================================
debian/patches/series
=====================================
@@ -3,3 +3,4 @@ wx3.0-compat.patch
 HelpDoesNotWork.patch
 configure_stdcc_17.patch
 gcc-14-32-bit.patch
+cross.patch



View it on GitLab: https://salsa.debian.org/med-team/gentle/-/commit/cfd4dc09e7d0378392765d1cbe4726f80eff6549

-- 
View it on GitLab: https://salsa.debian.org/med-team/gentle/-/commit/cfd4dc09e7d0378392765d1cbe4726f80eff6549
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/20251209/9dc9421c/attachment-0001.htm>