external/openldap/ExternalProject_openldap.mk | 2 +- external/openldap/UnpackedTarball_openldap.mk | 1 + external/openldap/string.patch.1 | 23 +++++++++++++++++++++++ 3 files changed, 25 insertions(+), 1 deletion(-)
New commits: commit 213a197e410f777430f3f1c1daf3ff73d310aabd Author: Michael Stahl <[email protected]> AuthorDate: Mon Nov 10 13:07:39 2025 +0100 Commit: Michael Stahl <[email protected]> CommitDate: Mon Nov 10 19:23:58 2025 +0100 openldap: fix GCC 15.2.1 build Change-Id: I4063368d90b948257c3e690ec8b3f9a2ec45b01d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193743 Reviewed-by: Michael Stahl <[email protected]> Tested-by: allotropia jenkins <[email protected]> diff --git a/external/openldap/ExternalProject_openldap.mk b/external/openldap/ExternalProject_openldap.mk index ed6fc7807a40..5ae2c4d25916 100644 --- a/external/openldap/ExternalProject_openldap.mk +++ b/external/openldap/ExternalProject_openldap.mk @@ -21,7 +21,7 @@ ifeq ($(OS),LINUX) # i.e., assuming glibc # pthread_setconcurrency in <pthread.h> (and once that is defined, it also needs either # _DEFUALT_SOURCE (glibc >= 2.19) or the deprecated _BSD_SOURCE (glibc <= 2.18) to be defined # explicitly, so that e.g. u_char is declared in <sys/types.h>): -openldap_CFLAGS = -D_XOPEN_SOURCE=500 -D_DEFAULT_SOURCE -D_BSD_SOURCE +openldap_CFLAGS = -D_XOPEN_SOURCE=500 -D_DEFAULT_SOURCE -D_BSD_SOURCE -Wno-error=incompatible-pointer-types endif openldap_LDFLAGS = diff --git a/external/openldap/UnpackedTarball_openldap.mk b/external/openldap/UnpackedTarball_openldap.mk index 98c88a28ccc5..f3ab52fa8964 100644 --- a/external/openldap/UnpackedTarball_openldap.mk +++ b/external/openldap/UnpackedTarball_openldap.mk @@ -22,6 +22,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,openldap,\ external/openldap/openldap-2.4.44.patch.1 \ external/openldap/configure-c99.patch \ external/openldap/Wint-conversion.patch \ + external/openldap/string.patch.1 \ )) # vim: set noet sw=4 ts=4: diff --git a/external/openldap/string.patch.1 b/external/openldap/string.patch.1 new file mode 100644 index 000000000000..d2242400eb71 --- /dev/null +++ b/external/openldap/string.patch.1 @@ -0,0 +1,23 @@ +GCC now complains about these bogus prototypes, error: conflicting types for... +--- openldap/include/ac/string.h.orig 2025-11-10 12:55:36.853472895 +0100 ++++ openldap/include/ac/string.h 2025-11-10 12:56:35.124352637 +0100 +@@ -58,7 +58,7 @@ + #elif !defined(_WIN32) + /* some systems fail to declare strdup */ + /* Windows does not require this declaration */ +- LDAP_LIBC_F(char *) (strdup)(); ++/* LDAP_LIBC_F(char *) (strdup)(); */ + #endif + + /* +@@ -68,8 +68,8 @@ + + /* we don't want these declared for Windows or Mingw */ + #ifndef _WIN32 +-int (strcasecmp)(); +-int (strncasecmp)(); ++/*int (strcasecmp)(); ++int (strncasecmp)();*/ + #endif + + #ifndef SAFEMEMCPY
