Fix build with gcc-4.4, bug 264761. Thanks to Daniel J. <sleeperseven@hotmail.com> for the patch. Versions still affected: openldap-2.4.7, 2.4.10, 2.4.11*, but PMASKED. Use 2.4.16 if you have to.

(Portage version: 2.2_rc28/cvs/Linux x86_64)

8 files changed, 58 insertions, 7 deletions

diff --git a/net-nds/openldap/ChangeLog b/net-nds/openldap/ChangeLog
index d7fee01cc275..a539e4bd7012 100644
--- a/net-nds/openldap/ChangeLog
+++ b/net-nds/openldap/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-nds/openldap
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.342 2009/04/14 20:53:32 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.343 2009/05/08 01:16:29 loki_val Exp $
+
+  08 May 2009; Peter Alfredsen <loki_val@gentoo.org>
+  +files/openldap-2.3.XY-gcc44.patch, openldap-2.3.39-r2.ebuild,
+  openldap-2.3.40-r1.ebuild, openldap-2.3.41.ebuild,
+  openldap-2.3.41-r1.ebuild, openldap-2.3.43.ebuild,
+  openldap-2.3.43-r1.ebuild:
+  Fix build with gcc-4.4, bug 264761. Thanks to Daniel J.
+  <sleeperseven@hotmail.com> for the patch. Versions still affected:
+  openldap-2.4.7, 2.4.10, 2.4.11*, but PMASKED. Use 2.4.16 if you have to.
 
 *openldap-2.4.16 (14 Apr 2009)
 
diff --git a/net-nds/openldap/files/openldap-2.3.XY-gcc44.patch b/net-nds/openldap/files/openldap-2.3.XY-gcc44.patch
new file mode 100644
index 000000000000..0213d81dc85c
--- /dev/null
+++ b/net-nds/openldap/files/openldap-2.3.XY-gcc44.patch
@@ -0,0 +1,30 @@
+--- include/ldap_pvt_thread.h	2009-04-03 08:51:30.000000000 -0400
++++ include/ldap_pvt_thread.h	2009-04-03 08:56:36.000000000 -0400
+@@ -57,12 +57,12 @@
+ 
+ #ifndef LDAP_PVT_THREAD_H_DONE
+ #define	LDAP_PVT_THREAD_SET_STACK_SIZE
+-#ifndef LDAP_PVT_THREAD_STACK_SIZE
+-	/* LARGE stack. Will be twice as large on 64 bit machine. */
+-#define LDAP_PVT_THREAD_STACK_SIZE	( 1 * 1024 * 1024 * sizeof(void *) )
+ /* May be explicitly defined to zero to disable it */
+-#elif LDAP_PVT_THREAD_STACK_SIZE == 0
++#if defined( LDAP_PVT_THREAD_STACK_SIZE ) && LDAP_PVT_THREAD_STACK_SIZE == 0
+ #undef LDAP_PVT_THREAD_SET_STACK_SIZE
++#elif !defined(LDAP_PVT_THREAD_STACK_SIZE)
++	/* LARGE stack. Will be twice as large on 64 bit machine. */
++#define LDAP_PVT_THREAD_STACK_SIZE	( 1 * 1024 * 1024 * sizeof(void *) )
+ #endif
+ #endif /* !LDAP_PVT_THREAD_H_DONE */
+ 
+--- libraries/libldap/os-ip.c	2009-04-03 08:51:30.000000000 -0400
++++ libraries/libldap/os-ip.c	2009-04-03 08:54:47.000000000 -0400
+@@ -652,7 +652,7 @@
+ 		char *herr;
+ #ifdef NI_MAXHOST
+ 		char hbuf[NI_MAXHOST];
+-#elif defined( MAXHOSTNAMELEN
++#elif defined( MAXHOSTNAMELEN )
+ 		char hbuf[MAXHOSTNAMELEN];
+ #else
+ 		char hbuf[256];
diff --git a/net-nds/openldap/openldap-2.3.39-r2.ebuild b/net-nds/openldap/openldap-2.3.39-r2.ebuild
index 6eab8fc0297a..fcf29ab3cc66 100644
--- a/net-nds/openldap/openldap-2.3.39-r2.ebuild
+++ b/net-nds/openldap/openldap-2.3.39-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.39-r2.ebuild,v 1.14 2009/03/07 13:04:12 gentoofan23 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.39-r2.ebuild,v 1.15 2009/05/08 01:16:29 loki_val Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -216,6 +216,8 @@ src_unpack() {
 		cd "${S}"/contrib
 		epatch "${FILESDIR}"/${PN}-2.3.24-contrib-smbk5pwd.patch
 	fi
+	# Fix gcc-4.4 compat, bug 264761
+	epatch "${FILESDIR}/openldap-2.3.XY-gcc44.patch"
 }
 
 src_compile() {
diff --git a/net-nds/openldap/openldap-2.3.40-r1.ebuild b/net-nds/openldap/openldap-2.3.40-r1.ebuild
index 0a9cac2a2d7d..ce25f4fe1022 100644
--- a/net-nds/openldap/openldap-2.3.40-r1.ebuild
+++ b/net-nds/openldap/openldap-2.3.40-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.40-r1.ebuild,v 1.6 2009/03/07 13:04:12 gentoofan23 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.40-r1.ebuild,v 1.7 2009/05/08 01:16:29 loki_val Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -216,6 +216,8 @@ src_unpack() {
 		cd "${S}"/contrib
 		epatch "${FILESDIR}"/${PN}-2.3.24-contrib-smbk5pwd.patch
 	fi
+	# Fix gcc-4.4 compat, bug 264761
+	epatch "${FILESDIR}/openldap-2.3.XY-gcc44.patch"
 }
 
 src_compile() {
diff --git a/net-nds/openldap/openldap-2.3.41-r1.ebuild b/net-nds/openldap/openldap-2.3.41-r1.ebuild
index d942f985a40b..c52cfecc1687 100644
--- a/net-nds/openldap/openldap-2.3.41-r1.ebuild
+++ b/net-nds/openldap/openldap-2.3.41-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.41-r1.ebuild,v 1.3 2009/03/07 13:04:12 gentoofan23 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.41-r1.ebuild,v 1.4 2009/05/08 01:16:29 loki_val Exp $
 
 EAPI="1"
 
@@ -230,6 +230,8 @@ src_unpack() {
 		cd "${S}"/contrib
 		epatch "${FILESDIR}"/${PN}-2.3.24-contrib-smbk5pwd.patch
 	fi
+	# Fix gcc-4.4 compat, bug 264761
+	epatch "${FILESDIR}/openldap-2.3.XY-gcc44.patch"
 }
 
 src_compile() {
diff --git a/net-nds/openldap/openldap-2.3.41.ebuild b/net-nds/openldap/openldap-2.3.41.ebuild
index 8f7d16729174..d1b7e0598fae 100644
--- a/net-nds/openldap/openldap-2.3.41.ebuild
+++ b/net-nds/openldap/openldap-2.3.41.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.41.ebuild,v 1.11 2009/03/07 13:04:12 gentoofan23 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.41.ebuild,v 1.12 2009/05/08 01:16:29 loki_val Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -216,6 +216,8 @@ src_unpack() {
 		cd "${S}"/contrib
 		epatch "${FILESDIR}"/${PN}-2.3.24-contrib-smbk5pwd.patch
 	fi
+	# Fix gcc-4.4 compat, bug 264761
+	epatch "${FILESDIR}/openldap-2.3.XY-gcc44.patch"
 }
 
 src_compile() {
diff --git a/net-nds/openldap/openldap-2.3.43-r1.ebuild b/net-nds/openldap/openldap-2.3.43-r1.ebuild
index a3c2917b681c..59696c75d5b9 100644
--- a/net-nds/openldap/openldap-2.3.43-r1.ebuild
+++ b/net-nds/openldap/openldap-2.3.43-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.43-r1.ebuild,v 1.5 2009/03/07 13:04:12 gentoofan23 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.43-r1.ebuild,v 1.6 2009/05/08 01:16:29 loki_val Exp $
 
 EAPI="2"
 
@@ -229,6 +229,8 @@ src_prepare() {
 		cd "${S}"/contrib
 		epatch "${FILESDIR}"/${PN}-2.3.24-contrib-smbk5pwd.patch
 	fi
+	# Fix gcc-4.4 compat, bug 264761
+	epatch "${FILESDIR}/openldap-2.3.XY-gcc44.patch"
 }
 
 src_configure() {
diff --git a/net-nds/openldap/openldap-2.3.43.ebuild b/net-nds/openldap/openldap-2.3.43.ebuild
index 022cae2c354d..eb50a2a60072 100644
--- a/net-nds/openldap/openldap-2.3.43.ebuild
+++ b/net-nds/openldap/openldap-2.3.43.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.43.ebuild,v 1.11 2009/03/07 13:04:12 gentoofan23 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.43.ebuild,v 1.12 2009/05/08 01:16:29 loki_val Exp $
 
 EAPI="2"
 
@@ -228,6 +228,8 @@ src_prepare() {
 		cd "${S}"/contrib
 		epatch "${FILESDIR}"/${PN}-2.3.24-contrib-smbk5pwd.patch
 	fi
+	# Fix gcc-4.4 compat, bug 264761
+	epatch "${FILESDIR}/openldap-2.3.XY-gcc44.patch"
 }
 
 src_configure() {