diff options
| author |   Sergei Trofimovich <slyfox@gentoo.org> | 2012-02-20 07:37:45 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2012-02-20 07:37:45 +0000 |
| commit | cad0762cfafd1a9db210d1ace247b2f396fdedaa (patch) | |
| tree | 6058b6b5378c8e84ef4c301946fd4e8419e7232d | |
| parent | Bump for #404565 (diff) | |
| download | gentoo-2-cad0762cfafd1a9db210d1ace247b2f396fdedaa.tar.gz gentoo-2-cad0762cfafd1a9db210d1ace247b2f396fdedaa.tar.bz2 gentoo-2-cad0762cfafd1a9db210d1ace247b2f396fdedaa.zip | |
Fix libtool build failure when /bin/sh points to dash. Approved by robbat2.
(Portage version: 2.2.0_alpha87/cvs/Linux x86_64)
| -rw-r--r-- | net-nds/openldap/ChangeLog | 6 | ||||
| -rw-r--r-- | net-nds/openldap/files/openldap-2.4.28-fix-dash.patch | 26 | ||||
| -rw-r--r-- | net-nds/openldap/openldap-2.4.28-r1.ebuild | 5 |
3 files changed, 35 insertions, 2 deletions
diff --git a/net-nds/openldap/ChangeLog b/net-nds/openldap/ChangeLog index 0cbcb356a86c..5d8c322213aa 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.399 2012/02/20 02:54:35 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.400 2012/02/20 07:37:45 slyfox Exp $ + + 20 Feb 2012; Sergei Trofimovich <slyfox@gentoo.org> + +files/openldap-2.4.28-fix-dash.patch, openldap-2.4.28-r1.ebuild: + Fix libtool build failure when /bin/sh points to dash. Approved by robbat2. 20 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> openldap-2.4.28-r1.ebuild: Bug #404555: Use new variable AT_NOEAUTOMAKE instead of WANT_AUTOMAKE=none diff --git a/net-nds/openldap/files/openldap-2.4.28-fix-dash.patch b/net-nds/openldap/files/openldap-2.4.28-fix-dash.patch new file mode 100644 index 000000000000..d15c3d2231f4 --- /dev/null +++ b/net-nds/openldap/files/openldap-2.4.28-fix-dash.patch @@ -0,0 +1,26 @@ +Our libtool needs bash to work properly. +Patch unbreaks build when /bin/sh points to dash: + + Entering subdirectory liblber + /bin/sh ../../libtool --mode=compile x86_64-pc-linux-gnu-gcc -O0 -D_GNU_SOURCE -I../../include -I../../include -I/usr/include/db4.8 -DLDAP_CONNECTIONLESS -DLBER_LIBRARY -c assert.c + ../../build/mkversion -v "2.4.28" liblber.la > version.c + /bin/sh ../../libtool --mode=compile x86_64-pc-linux-gnu-gcc -O0 -D_GNU_SOURCE -I../../include -I../../include -I/usr/include/db4.8 -DLDAP_CONNECTIONLESS -DLBER_LIBRARY -c decode.c + eval: 1: base_compile+= x86_64-pc-linux-gnu-gcc: not found + eval: 1: base_compile+= -O0: not found + eval: 1: base_compile+= -D_GNU_SOURCE: not found + eval: 1: base_compile+= x86_64-pc-linux-gnu-gcc: not found + ... + make[2]: *** [decode.lo] Error 1 +diff --git a/build/top.mk b/build/top.mk +index 6fea488..ea324e3 100644 +--- a/build/top.mk ++++ b/build/top.mk +@@ -20,7 +20,7 @@ VERSION= @VERSION@ + RELEASEDATE= @OPENLDAP_RELEASE_DATE@ + + @SET_MAKE@ +-SHELL = /bin/sh ++SHELL = @SHELL@ + + top_builddir = @top_builddir@ + diff --git a/net-nds/openldap/openldap-2.4.28-r1.ebuild b/net-nds/openldap/openldap-2.4.28-r1.ebuild index 975f7bbe73c1..462abb1034c5 100644 --- a/net-nds/openldap/openldap-2.4.28-r1.ebuild +++ b/net-nds/openldap/openldap-2.4.28-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.28-r1.ebuild,v 1.4 2012/02/20 02:54:35 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.28-r1.ebuild,v 1.5 2012/02/20 07:37:45 slyfox Exp $ EAPI="3" @@ -253,6 +253,9 @@ src_prepare() { # bug #294350 epatch "${FILESDIR}"/${PN}-2.4.6-evolution-ntlm.patch + # unbreak /bin/sh -> dash + epatch "${FILESDIR}"/${PN}-2.4.28-fix-dash.patch + cd "${S}"/build einfo "Making sure upstream build strip does not do stripping too early" sed -i.orig \ |