diff options
| author |   Kacper Kowalik <xarthisius@gentoo.org> | 2012-06-13 11:06:45 +0000 |
|---|---|---|
| committer | Kacper Kowalik <xarthisius@gentoo.org> | 2012-06-13 11:06:45 +0000 |
| commit | 87d4fb6d849c49bd83929fcff910cd3fd53899b5 (patch) | |
| tree | 84ce03da62e607cbec0ec2086af2a13ba5fa8f64 /net-nds | |
| parent | Handle dodoc correctly to not die if no documents are found. (diff) | |
| download | gentoo-2-87d4fb6d849c49bd83929fcff910cd3fd53899b5.tar.gz gentoo-2-87d4fb6d849c49bd83929fcff910cd3fd53899b5.tar.bz2 gentoo-2-87d4fb6d849c49bd83929fcff910cd3fd53899b5.zip | |
Fix building with gcc-4.7 wrt #420959 by Tiziano Müller
(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)
Diffstat (limited to 'net-nds')
| -rw-r--r-- | net-nds/openldap/ChangeLog | 6 | ||||
| -rw-r--r-- | net-nds/openldap/files/openldap-2.4.31-gcc47.patch | 16 | ||||
| -rw-r--r-- | net-nds/openldap/openldap-2.4.31-r1.ebuild | 5 |
3 files changed, 25 insertions, 2 deletions
diff --git a/net-nds/openldap/ChangeLog b/net-nds/openldap/ChangeLog index 00c3f90a8964..69c16e411d50 100644 --- a/net-nds/openldap/ChangeLog +++ b/net-nds/openldap/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-nds/openldap # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.418 2012/05/27 07:22:43 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.419 2012/06/13 11:06:45 xarthisius Exp $ + + 13 Jun 2012; Kacper Kowalik <xarthisius@gentoo.org> + +files/openldap-2.4.31-gcc47.patch, openldap-2.4.31-r1.ebuild: + Fix building with gcc-4.7 wrt #420959 by Tiziano Müller *openldap-2.4.31-r1 (27 May 2012) diff --git a/net-nds/openldap/files/openldap-2.4.31-gcc47.patch b/net-nds/openldap/files/openldap-2.4.31-gcc47.patch new file mode 100644 index 000000000000..5b6af4b29564 --- /dev/null +++ b/net-nds/openldap/files/openldap-2.4.31-gcc47.patch @@ -0,0 +1,16 @@ +Fix building with gcc-4.7 + +https://bugs.gentoo.org/show_bug.cgi?id=420959 +http://www.openldap.org/its/index.cgi/Incoming?id=7304;page=16 #ITS 7304 + +Patch written by Kacper Kowalik <xarthisius@gentoo.org> +--- a/contrib/ldapc++/src/SaslInteractionHandler.cpp ++++ b/contrib/ldapc++/src/SaslInteractionHandler.cpp +@@ -16,6 +16,7 @@ + + #include <stdio.h> + #include <string.h> ++#include <unistd.h> + #include "SaslInteractionHandler.h" + #include "SaslInteraction.h" + #include "debug.h" diff --git a/net-nds/openldap/openldap-2.4.31-r1.ebuild b/net-nds/openldap/openldap-2.4.31-r1.ebuild index 76741fcc631b..4e587b300d9e 100644 --- a/net-nds/openldap/openldap-2.4.31-r1.ebuild +++ b/net-nds/openldap/openldap-2.4.31-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.31-r1.ebuild,v 1.1 2012/05/27 07:22:43 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.31-r1.ebuild,v 1.2 2012/06/13 11:06:45 xarthisius Exp $ EAPI="4" @@ -260,6 +260,9 @@ src_prepare() { # unbreak /bin/sh -> dash epatch "${FILESDIR}"/${PN}-2.4.28-fix-dash.patch + # bug #420959 + epatch "${FILESDIR}"/${P}-gcc47.patch + cd "${S}"/build einfo "Making sure upstream build strip does not do stripping too early" sed -i.orig \ |