Fix libtool build failure when /bin/sh points to dash. Approved by robbat2.

Package-Manager: portage-2.2.0_alpha87/cvs/Linux x86_64

4 files changed, 48 insertions, 4 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/Manifest b/net-nds/openldap/Manifest
index 5b94ac164729..4aae497a4d6a 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX DB_CONFIG.fast.example 746 RMD160 03d179d1c58d695c442eb5e3e69c245f3c2f2358 SHA1 c76a2a9f346a733ed6617d42229b434ce723c59e SHA256 69fc9aa6e4f0b888bc02d3f75642fe1ebf9345c685257a5c1236b2e79ed56e0b
 AUX openldap-2.2.14-perlthreadsfix.patch 614 RMD160 6e868aa5a5cc4e80c0340af25d18d010b342ed15 SHA1 3bb05c7ed511e8464331619ce23064d236a5fe82 SHA256 bb719cc1fed47ff0f111c960f3295781ae6f0d9e98b4266a87751044b4bb3175
 AUX openldap-2.2.6-ntlm.patch 5011 RMD160 317f4b6dc9589826739a14a8ad7200ed287c87be SHA1 29b8e9c4835235c976f026cd5883228b77581083 SHA256 1f7e766bcafb412ec336aad7e07295d6d62d2e2a62b6804b07b06a5056102243
@@ -13,6 +16,7 @@ AUX openldap-2.4.17-fix-lmpasswd-gnutls-symbols.patch 3542 RMD160 7e17304b2b85e2
 AUX openldap-2.4.17-gcc44.patch 509 RMD160 07c1b8400e1b24cb8f20f2647b1354d2b28f653d SHA1 5df5a165acec74667f5989f291aedd958be56358 SHA256 33345882f601050ecaa6bb3dd7458e6b5f8e3684345847f7a53d4a1b0f514bda
 AUX openldap-2.4.19-contrib-smbk5pwd.patch 1555 RMD160 ce8f5caafa4b3d89dc11537f0045335b25c59404 SHA1 372906228b2ab6be13a689f895e173abb4862f2e SHA256 8e08af4235529cbc0c4541a28d5cf7e8cf3f41f7504af41527e993e1399fee92
 AUX openldap-2.4.28-contrib-smbk5pwd.patch 1621 RMD160 3708b0709210b15cc93557fbb816c9ca064f2ec1 SHA1 883730e1f10849f817d9a7198514159ca305b73d SHA256 62937bd82d218cddc8637d194c6aedc316cd1eb6179c00ba70cef0381b4e841b
+AUX openldap-2.4.28-fix-dash.patch 1101 RMD160 0931b1358eda252b216883fce1bfa9f17c8527de SHA1 c23694f8590b082ee8cfc6f7d10db8bc10b1e276 SHA256 fddaad5f49cce39bf5492bb1dda10f2ce83419c48f128fe536661dde703b5d1b
 AUX openldap-2.4.28-gnutls-gcrypt.patch 340 RMD160 69c2c7527aa3723fa24c6ed1895b4f83ea105902 SHA1 af09a9e41adcc2d307c1758fc76b4cb543dac455 SHA256 26dc29a502e45f6b1003674c1ef5bc6c79b71d00fc9b2fc7a145291a314370c0
 AUX openldap-2.4.6-evolution-ntlm.patch 5161 RMD160 abbeb8b17a9011c1bfc3af3215839910a5a6b0ca SHA1 44aa771890530edd63fefa45cf6bef33202dd352 SHA256 3b79d9afaa7c76ca20c5e7aa856dea49931741a1022ae6c3bb264c38f4c22edb
 AUX slapd-confd 614 RMD160 1b1909eb2d81e380b424a9c970199d6ffe231068 SHA1 955b45e018a59d185b19ea86bccd781d3524c069 SHA256 901044908fbbbbf333f7f0f1efccd1f0e213aa1a9156b3e659eaf0a0c7fdfc89
@@ -36,7 +40,14 @@ EBUILD openldap-2.4.23.ebuild 20071 RMD160 0921b70143958f76347f22a040807332a5bd4
 EBUILD openldap-2.4.24.ebuild 20071 RMD160 fa3f7870c96873d3254895c340e93fba69218b55 SHA1 75ad97974d5969489701e4b79742622b0cccc922 SHA256 1b075d405d3a3c559aa9c8425e2e183c70bb82e62e95a4e73fb28cb833620afe
 EBUILD openldap-2.4.25-r1.ebuild 20776 RMD160 6af3aa22ef44f5bde09657bb91a636716db262dd SHA1 0b250d4909d96f43e6f794e78402c986a013df1e SHA256 e1484f726ae2b23edc5a087b36ae69e66a4f43685d17eeb59a2ce308cd6aa475
 EBUILD openldap-2.4.25.ebuild 20081 RMD160 3a9343f7c83e7d872cb7ab23eac526e3f753dc7b SHA1 a9a490196c313ac3bf788d18fe09b037fd28d26f SHA256 c79c9180221ea5b7b1989eefabb741deef89269782541677f7d32f4e72591c22
-EBUILD openldap-2.4.28-r1.ebuild 21912 RMD160 e709541c2fbf9bd6343edf5ae987f4263299eb87 SHA1 47c894405abf361bc95f7625d04959ff2f5385de SHA256 2720b0676317bc8a88fb2da9933f21b9f20b74c3b9c6c9bd8c1681f750c92c60
+EBUILD openldap-2.4.28-r1.ebuild 21989 RMD160 75c8d0f7ec6ccb413bc964a7b760e26727dd45ea SHA1 be58eeffe24b827c255346a48bd4deb22679134f SHA256 be4fedfe151738f8051b86ff08498db6c6a64351ff7c40acad4364a9259f0a62
 EBUILD openldap-2.4.28.ebuild 20773 RMD160 6a0b94ea4c82e1a1463a83a4d728e605ad4ed966 SHA1 c9fb70df7b94dc4f5f92b63b5ea4881a9a14e6c6 SHA256 c028282315adf8d64296ef1abd3d7b8bac32eef40190960708d028fb5ff22d97
-MISC ChangeLog 69727 RMD160 46415d671df7908e0551e0bae8859f1f48522f87 SHA1 be563dd804eb48db565b5d5f050c56401e85a7cb SHA256 2d9ee861ebf480b6942af3182e3d7ee1df3e4301b2f2c11069c197118236afe2
+MISC ChangeLog 69927 RMD160 93359f9dcb22ad0d91bb44d5cfcaa4b70a091922 SHA1 2f018eddc991dcba8029e282766dd7e6e89c3766 SHA256 306ff560dfe08617d7746c1263f72582367277f70417896ace526dc7fb9981ac
 MISC metadata.xml 556 RMD160 14eae07812da4eecd05e467d1dccf841e6e16be6 SHA1 fa4c8d1aa03dd6bb9c27a7758fbaba5355cfe590 SHA256 405d4cd6f15d8495d0c7365f7b7d6bda9b82775d7e157339f3a6e92d46eed2c8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk9B+FgACgkQcaHudmEf86qGOQCdHG8n2L3RWG7suAcH6d5P0olk
+IYEAn1ZL/S49y8yFXvkSjF1PbpLTvHS8
+=JRGG
+-----END PGP SIGNATURE-----
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 \