summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2011-05-16 06:05:11 +0000
committerMike Frysinger <vapier@gentoo.org>2011-05-16 06:05:11 +0000
commit6f2f068dad25e906eb18d38e60526ae036463a1a (patch)
tree744fd483aa9ddfaa110e50cb232d356505aefc3e /sys-apps/acl
parentRevision bump to create a stable candidate. (diff)
downloadgentoo-2-6f2f068dad25e906eb18d38e60526ae036463a1a.tar.gz
gentoo-2-6f2f068dad25e906eb18d38e60526ae036463a1a.tar.bz2
gentoo-2-6f2f068dad25e906eb18d38e60526ae036463a1a.zip
Fix building when /bin/sh is not functional enough #365397 by Piotr Karbowski.
(Portage version: 2.2.0_alpha32/cvs/Linux x86_64)
Diffstat (limited to 'sys-apps/acl')
-rw-r--r--sys-apps/acl/ChangeLog7
-rw-r--r--sys-apps/acl/acl-2.2.51.ebuild3
-rw-r--r--sys-apps/acl/files/acl-2.2.51-config-shell.patch53
3 files changed, 61 insertions, 2 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/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
+