Fix building when /bin/sh is not functional enough #365397 by Piotr Karbowski.

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

4 files changed, 67 insertions, 7 deletions

diff --git a/sys-apps/acl/ChangeLog b/sys-apps/acl/ChangeLog
index ff5eeae220bd..fb0b4074a6f7 100644
--- a/sys-apps/acl/ChangeLog
+++ b/sys-apps/acl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/acl
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/acl/ChangeLog,v 1.110 2011/04/29 22:41:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/acl/ChangeLog,v 1.111 2011/05/16 06:05:11 vapier Exp $
+
+  16 May 2011; Mike Frysinger <vapier@gentoo.org> acl-2.2.51.ebuild,
+  +files/acl-2.2.51-config-shell.patch:
+  Fix building when /bin/sh is not functional enough #365397 by Piotr
+  Karbowski.
 
 *acl-2.2.51 (29 Apr 2011)
 
diff --git a/sys-apps/acl/Manifest b/sys-apps/acl/Manifest
index f986d3547774..a1f95105426c 100644
--- a/sys-apps/acl/Manifest
+++ b/sys-apps/acl/Manifest
@@ -2,18 +2,19 @@
 Hash: SHA256
 
 AUX acl-2.2.49-quote-strchr.patch 657 RMD160 42a17e7a1bec893f8655270b85c3821c8f4c4665 SHA1 39b6bbb34d844fe1365df1b84b8fb41d574acbbc SHA256 d172b07ae4ccb4c8da95f90cc836075e6e582b3b57e029987e4197e58f5daf15
+AUX acl-2.2.51-config-shell.patch 1497 RMD160 e4765a6378cc8ae11e90316eb0f5c1587258ad13 SHA1 9a06a74f0760b2b2d6e10856aa8d1ceb73bfb588 SHA256 fcbb60deee675d265b9cba618ce82df7c3093efdfca3489dd2aacf73fc98d076
 DIST acl-2.2.42-CITI_NFS4_ALL-2.dif 97276 RMD160 d1cbac2f52d4889a96b3225f301a60cf5e91286e SHA1 543bf9fa9c91dad8c5bfbe58b7122963b712a08c SHA256 10c930e4c6d147d03ad6dc67e38663522fd277525c149d932a8279e2cbe1b95e
 DIST acl-2.2.49.src.tar.gz 362743 RMD160 62a3ccd162b1fa28159467ec46eedf8255adb00c SHA1 6f223daa5aafc8a6d29dbf579c82e86312aeb75d SHA256 b9c7f4752e4ef4930a62fa5aa0d7efe1cba2b5a3a2d6ee2b45c0a70c72b7e5d5
 DIST acl-2.2.51.src.tar.gz 385378 RMD160 5171bfbf55b8bf4c204503a72da568d38423dcdf SHA1 60d0b055949c2ba6155187f05ed2b0f89cb895b9 SHA256 06854521cf5d396801af7e54b9636680edf8064355e51c07657ec7442a185225
 EBUILD acl-2.2.49-r1.ebuild 1897 RMD160 24addaa612ec2356bb7ab10425346fa842c44d72 SHA1 4c2b510eb6ddc28c6e1572b514c75660c1b2dcb5 SHA256 16eefd23183fa09115300c878491cb51c882b61d481a43862b6a1a9fd4c75f56
 EBUILD acl-2.2.49.ebuild 1838 RMD160 611e44456638eefca95e50d740765f297f2aea1f SHA1 f057084b22ddb61befc6045a1b62841a7809ff12 SHA256 6795b9767a3144983c2c03e787c40cb925bc9f901634e995e977ee9642acdae2
-EBUILD acl-2.2.51.ebuild 1901 RMD160 610dbababecf94326d6ab234c1cf562ad0f0b5aa SHA1 623ba5782c762197264fee3b4730f11a8581614e SHA256 a751466aab3d33d4427e15996a5080e94adca8dfb52c52161dfc6646862eb214
-MISC ChangeLog 14029 RMD160 9f353e4ae67feb11bf0eb1340e8112eb5af24034 SHA1 787c015749afba4222ddf6aadf90af3e35bcbad6 SHA256 5246f550f3972516909802d9bf7dd8f4559450ce92970c05fe0cef0085544fb8
+EBUILD acl-2.2.51.ebuild 1963 RMD160 73ea5296a3cc1be5159ab09a6bf9579d450d37a4 SHA1 8c1a0ce0ab1582645e659d7a43e849242013d11e SHA256 1190b3aba2729b41784e699c3ba95ac0ab1a8b3f448bccb5bac8825286ac1f32
+MISC ChangeLog 14222 RMD160 fb0f2958219e28942eef18121f9e516ce68412cd SHA1 4304772e0f49755b0cf3557cd62948690daf78cf SHA256 5eb59b5e88ba49d315d64ce0150e2b23913dc5f09bf26fbe13e600aaee0f6c36
 MISC metadata.xml 232 RMD160 90ec4a1cc6ada64a7fd4876979cf14349fc88ea5 SHA1 3a5ced6e3af6b759ef8adc8e4f6a51dbf91fb8ce SHA256 441f653b762deb6e3674d915c6762f28b9e60f3887628e953df603634acd87ad
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk27PoMACgkQaC/OocHi7JZnpQEAjTvsUyX4vkPPY1AC2WtCQt8P
-oA4qckcQccpn0m0B9IoA/3qhMr8j/QR2CmyiJ0B+EySxERzPaZac72oAEU2XGuPW
-=aTPA
+iF4EAREIAAYFAk3Qvp0ACgkQaC/OocHi7Ja+dQD/UoFr8F5/TDZzMXaeO3qg7qIU
+vDUnnDGPPEl1Apwc7D8A/23MUQWBuY9L9yB53agDgOPPQAGo9+730+4hdzQimmde
+=Z1xJ
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/acl/acl-2.2.51.ebuild b/sys-apps/acl/acl-2.2.51.ebuild
index 5ebe94629d94..a49a5e4e5bdf 100644
--- a/sys-apps/acl/acl-2.2.51.ebuild
+++ b/sys-apps/acl/acl-2.2.51.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/acl/acl-2.2.51.ebuild,v 1.1 2011/04/29 22:41:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/acl/acl-2.2.51.ebuild,v 1.2 2011/05/16 06:05:11 vapier Exp $
 
 EAPI="4"
 
@@ -30,6 +30,7 @@ src_prepare() {
 		epatch acl-2.2.42-CITI_NFS4_ALL-2.dif
 	fi
 	epatch "${FILESDIR}"/${PN}-2.2.49-quote-strchr.patch
+	epatch "${FILESDIR}"/${PN}-2.2.51-config-shell.patch #365397
 	sed -i \
 		-e '/^as_dummy=/s:=":="$PATH$PATH_SEPARATOR:' \
 		configure # hack PATH with AC_PATH_PROG
diff --git a/sys-apps/acl/files/acl-2.2.51-config-shell.patch b/sys-apps/acl/files/acl-2.2.51-config-shell.patch
new file mode 100644
index 000000000000..78b3f0f641db
--- /dev/null
+++ b/sys-apps/acl/files/acl-2.2.51-config-shell.patch
@@ -0,0 +1,53 @@
+https://bugs.gentoo.org/365397
+
+From 10bfb16245ec4b55c1f5b6dc5554913bc9b13c9c Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Mon, 16 May 2011 01:59:52 -0400
+Subject: [PATCH] use SHELL from configure
+
+If /bin/sh is not a functional enough shell, configure will select a
+SHELL of /bin/bash or better.  But the current build helpers always
+hardcode /bin/sh, so if libtool itself configures itself for /bin/bash,
+things will fail when it attempts to do:
+	SHELL = /bin/sh
+	LIBTOOL = $(SHELL) .../libtool
+	...
+	eval: 1: base_compile+= -pipe: not found
+	...
+
+So rather than hardcoding SHELL to /bin/sh, set it to @SHELL@ and let
+configure find a good value for us.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ include/builddefs.in |    1 +
+ include/buildmacros  |    1 -
+ 2 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/include/builddefs.in b/include/builddefs.in
+index d054a56..434ce95 100644
+--- a/include/builddefs.in
++++ b/include/builddefs.in
+@@ -46,6 +46,7 @@ MAKE		= @make@
+ ECHO		= @echo@
+ SORT		= @sort@
+ LN_S		= @LN_S@
++SHELL		= @SHELL@
+ LIBTOOL		= @LIBTOOL@
+ MAKEDEPEND	= @makedepend@
+ 
+diff --git a/include/buildmacros b/include/buildmacros
+index ab89182..8efb32e 100644
+--- a/include/buildmacros
++++ b/include/buildmacros
+@@ -42,7 +42,6 @@ OBJECTS = $(ASFILES:.s=.o) \
+ 
+ INSTALL	= $(TOPDIR)/include/install-sh -o $(PKG_USER) -g $(PKG_GROUP)
+ 
+-SHELL = /bin/sh
+ IMAGES_DIR = $(TOPDIR)/all-images
+ DIST_DIR = $(TOPDIR)/dist
+ 
+-- 
+1.7.5.rc3
+