haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 19:50:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

postgresql12, revbump, use icu74 (#10093)

Browse Source
This commit is contained in:
Schrijvers Luc
2024-02-14 09:25:13 +00:00
committed by GitHub
parent d75085a35b
commit 6abae3779b
2 changed files with 61 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
dev-db/postgresql/patches/postgresql12-12.0.patchset
View File

@@ -1,4 +1,4 @@
From b79cd20e894787165914ed5a3c777a86e8b97055 Mon Sep 17 00:00:00 2001
From 09752f6b9cf2826ffca43c23fc514741b6f483b0 Mon Sep 17 00:00:00 2001
From: Augustin Cavalier <waddlesplash@gmail.com>
Date: Thu, 3 Oct 2019 17:36:43 +0000
Subject: Changes to make Postgresql run on Haiku.
@@ -575,10 +575,10 @@ diff --git a/src/template/haiku b/src/template/haiku
new file mode 100644
index 0000000..e69de29
--
2.37.3
2.42.1
From 5a79714834681eec183f65c037b2c186772485be Mon Sep 17 00:00:00 2001
From 77c3db3ae32428f2f81813585c3b20dc431a5aaf Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Mon, 26 Dec 2022 17:35:12 +0100
Subject: adjust autoconf required version
@@ -598,5 +598,47 @@ index 339db16..f9339f5 100644
recommended. You can remove the check from 'configure.in' but it is then
your responsibility whether the result works or not.])])
--
2.37.3
2.42.1
From 9f6e8b6f09b591b0d7d3bdd92618831edc2ca97a Mon Sep 17 00:00:00 2001
From: Begasus <begasus@gmail.com>
Date: Fri, 9 Feb 2024 16:23:14 +0100
Subject: Fix build with newer ldap (from upstream)
diff --git a/configure.in b/configure.in
index f9339f5..af3fc1d 100644
--- a/configure.in
+++ b/configure.in
@@ -1236,17 +1236,20 @@ fi
if test "$with_ldap" = yes ; then
_LIBS="$LIBS"
if test "$PORTNAME" != "win32"; then
- AC_CHECK_LIB(ldap, ldap_bind, [],
- [AC_MSG_ERROR([library 'ldap' is required for LDAP])],
- [$EXTRA_LDAP_LIBS])
- LDAP_LIBS_BE="-lldap $EXTRA_LDAP_LIBS"
if test "$enable_thread_safety" = yes; then
# on some platforms ldap_r fails to link without PTHREAD_LIBS
- AC_CHECK_LIB(ldap_r, ldap_simple_bind, [],
- [AC_MSG_ERROR([library 'ldap_r' is required for LDAP])],
+ # OpenLDAP 2.5 merged ldap_r with ldap
+ LIBS=""
+ AC_SEARCH_LIBS(ldap_simple_bind, [ldap_r ldap], [],
+ [AC_MSG_ERROR([not found in any LDAP library])],
[$PTHREAD_CFLAGS $PTHREAD_LIBS $EXTRA_LDAP_LIBS])
- LDAP_LIBS_FE="-lldap_r $EXTRA_LDAP_LIBS"
+ LDAP_LIBS_BE="-lldap $EXTRA_LDAP_LIBS"
+ LDAP_LIBS_FE="$LIBS $EXTRA_LDAP_LIBS"
else
+ AC_CHECK_LIB(ldap, ldap_bind, [],
+ [AC_MSG_ERROR([library 'ldap' is required for LDAP])],
+ [$EXTRA_LDAP_LIBS])
+ LDAP_LIBS_BE="-lldap $EXTRA_LDAP_LIBS"
LDAP_LIBS_FE="-lldap $EXTRA_LDAP_LIBS"
fi
AC_CHECK_FUNCS([ldap_initialize])
--
2.42.1