[debian-mysql] Bug#994665: mariadb-10.5: FTBFS on kfreebsd

[Laurent Bigonville]

Source: mariadb-10.5
Version: 1:10.5.12-1
Severity: important
Tags: patch ftbfs upstream
Justification: fails to build from source (but built successfully in the past)

Hello,

mariadb-10.5 currently FTBFS on kfreebsd with the following error:

[ 33%] Building CXX object storage/perfschema/CMakeFiles/perfschema.dir/mysqld_thd_manager.cc.o
cd /<<PKGBUILDDIR>>/builddir/storage/perfschema && /usr/bin/c++ -DDBUG_TRACE -DHAVE_CONFIG_H -DHAVE_OPENSSL -DMYSQL_SERVER -I/<<PKGBUILDDIR>>/wsrep-lib/include -I/<<PKGBUILDDIR>>/wsrep-lib/wsrep-API/v26 -I/<<PKGBUILDDIR>>/builddir/include -I/<<PKGBUILDDIR>>/include -I/<<PKGBUILDDIR>>/sql -I/<<PKGBUILDDIR>>/builddir/sql -I/<<PKGBUILDDIR>>/builddir/storage/perfschema -g -O2 -ffile-prefix-map=/<<PKGBUILDDIR>>=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wdate-time -D_FORTIFY_SOURCE=2 -pie -fPIC -fstack-protector --param=ssp-buffer-size=4 -O2 -g -static-libgcc -fno-omit-frame-pointer -fno-strict-aliasing -Wno-uninitialized -fno-omit-frame-pointer -D_FORTIFY_SOURCE=2 -DDBUG_OFF -Wall -Wextra -Wformat-security -Wno-format-truncation -Wno-init-self -Wno-nonnull-compare -Wno-unused-parameter -Woverloaded-virtual -Wnon-virtual-dtor -Wvla -Wwrite-strings   -Wdate-time -D_FORTIFY_SOURCE=2  -fvisibility=hidden -std=gnu++11 -o CMakeFiles/perfschema.dir/mysqld_thd_manager.cc.o -c /<<PKGBUILDDIR>>/storage/perfschema/mysqld_thd_manager.cc
In file included from /<<PKGBUILDDIR>>/storage/perfschema/mysqld_thd_manager.h:4,
                 from /<<PKGBUILDDIR>>/storage/perfschema/mysqld_thd_manager.cc:1:
/<<PKGBUILDDIR>>/storage/perfschema/my_thread.h:27:9: error: ‘uintptr_t’ does not name a type; did you mean ‘intptr_t’?
   27 | typedef uintptr_t my_thread_os_id_t;
      |         ^~~~~~~~~
      |         intptr_t
/<<PKGBUILDDIR>>/storage/perfschema/my_thread.h:50:15: error: ‘my_thread_os_id_t’ does not name a type; did you mean ‘my_thread_attr_t’?
   50 | static inline my_thread_os_id_t my_thread_os_id()
      |               ^~~~~~~~~~~~~~~~~
      |               my_thread_attr_t

The attached patch fixes that error

Could you please apply this patch in debian and/or forward it upstream
as well?

Kind regards,
Laurent Bigonville


-- System Information:
Debian Release: bookworm/sid
  APT prefers unstable-debug
  APT policy: (500, 'unstable-debug'), (500, 'unstable'), (1, 'experimental-debug'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 5.10.0-8-amd64 (SMP w/8 CPU threads)
Kernel taint flags: TAINT_WARN
Locale: LANG=fr_BE.UTF-8, LC_CTYPE=fr_BE.UTF-8 (charmap=UTF-8), LANGUAGE=fr_BE:fr
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: SELinux: enabled - Mode: Permissive - Policy name: refpolicy
-------------- next part --------------
Index: mariadb-10.5-10.5.12/storage/perfschema/my_thread.h
===================================================================
--- mariadb-10.5-10.5.12.orig/storage/perfschema/my_thread.h
+++ mariadb-10.5-10.5.12/storage/perfschema/my_thread.h
@@ -14,6 +14,10 @@
 #include <pthread_np.h>
 #endif

+#ifdef HAVE_INTEGER_PTHREAD_SELF
+#include <stdint.h>
+#endif
+
 typedef pthread_key_t thread_local_key_t;
 typedef pthread_t my_thread_handle;
 typedef pthread_attr_t my_thread_attr_t;