From a569d4096d91a06a40a8dbf4ff4350f664d462bd Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 13 Apr 2024 15:39:14 +0200 Subject: Merging debian version 1:10.11.7-1. Signed-off-by: Daniel Baumann --- debian/patches/1006531-hurd-no-auth-socket.patch | 28 ++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 debian/patches/1006531-hurd-no-auth-socket.patch (limited to 'debian/patches/1006531-hurd-no-auth-socket.patch') diff --git a/debian/patches/1006531-hurd-no-auth-socket.patch b/debian/patches/1006531-hurd-no-auth-socket.patch new file mode 100644 index 00000000..c730ae5f --- /dev/null +++ b/debian/patches/1006531-hurd-no-auth-socket.patch @@ -0,0 +1,28 @@ +Forwarded: no +From: Daniel Black +To: 1006531@bugs.debian.org +Subject: mariadb: FTBFS on hurd-i386: undefined reference to misc functions and files + +requires https://github.com/MariaDB/server/pull/2893 as debian +explicit architectures aren't neede since dh_auto_configure handles +this. + +If it works, upstream welcome. + +Hurd string from uname -m, "SYSTEM processor: i686-AT386" in mariadb +output. And wiki reference https://en.wikipedia.org/wiki/Uname + +--- a/cmake/build_configurations/mysql_release.cmake ++++ b/cmake/build_configurations/mysql_release.cmake +@@ -118,7 +118,10 @@ ELSEIF(DEB) + SET(WITH_ZLIB system CACHE STRING "") + SET(WITH_LIBWRAP ON) + SET(HAVE_EMBEDDED_PRIVILEGE_CONTROL ON) +- SET(PLUGIN_AUTH_SOCKET YES CACHE STRING "") ++ # No hurd implementation ++ IF(NOT CMAKE_SYSTEM_PROCESSOR STREQUAL "i686-AT386") ++ SET(PLUGIN_AUTH_SOCKET YES CACHE STRING "") ++ ENDIF() + SET(WITH_EMBEDDED_SERVER ON CACHE BOOL "") + SET(WITH_PCRE system CACHE STRING "") + SET(CLIENT_PLUGIN_ZSTD OFF) -- cgit v1.2.3