Fix building with FEATURES=distcc (chokes on TMPDIR being set, respect CFLAGS.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A792A613)

4 files changed, 44 insertions, 4 deletions

diff --git a/sys-apps/ipmiutil/ChangeLog b/sys-apps/ipmiutil/ChangeLog
index 5592eccdee1d..8bfdf93ded20 100644
--- a/sys-apps/ipmiutil/ChangeLog
+++ b/sys-apps/ipmiutil/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/ipmiutil
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ipmiutil/ChangeLog,v 1.24 2014/06/28 01:05:28 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ipmiutil/ChangeLog,v 1.25 2014/06/28 14:20:18 jer Exp $
+
+  28 Jun 2014; Jeroen Roovers <jer@gentoo.org> ipmiutil-2.9.3.ebuild,
+  +files/ipmiutil-2.9.3-flags.patch, +files/ipmiutil-2.9.3-tmpdir.patch:
+  Fix building with FEATURES=distcc (chokes on TMPDIR being set, respect
+  CFLAGS.
 
 *ipmiutil-2.9.3 (28 Jun 2014)
 
diff --git a/sys-apps/ipmiutil/files/ipmiutil-2.9.3-flags.patch b/sys-apps/ipmiutil/files/ipmiutil-2.9.3-flags.patch
new file mode 100644
index 000000000000..25572ffa1b87
--- /dev/null
+++ b/sys-apps/ipmiutil/files/ipmiutil-2.9.3-flags.patch
@@ -0,0 +1,20 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -145,7 +145,7 @@
+ 	LANPLUS_CRYPTO=""
+ 	LANPLUS_SAM="no"
+ 	LD_SAMX=""
+-	CFLAGS="-O2"
++#	CFLAGS="-O2"
+         SUBDIR_S="doc scripts util"
+ 	if test "x$cross_compiling" = "xyes"; then
+ 	   # cross-compiling, so link with -static (e.g. Android ARM)
+@@ -270,7 +270,7 @@
+ 	fi
+         rm -f $tmpc $tmpo >/dev/null 2>&1
+ 	echo $ECHO_N "checking compile fortify flags ... $ECHO_C"
+-	cfhard="-fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
++#	cfhard="-fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
+ 	echo "int main() { return(1); }" >$tmpc
+ 	gcc -o $tmpo -c $cfhard $tmpc  >/dev/null 2>&1
+ 	if test $? -ne 0 ; then
diff --git a/sys-apps/ipmiutil/files/ipmiutil-2.9.3-tmpdir.patch b/sys-apps/ipmiutil/files/ipmiutil-2.9.3-tmpdir.patch
new file mode 100644
index 000000000000..73004f77aabb
--- /dev/null
+++ b/sys-apps/ipmiutil/files/ipmiutil-2.9.3-tmpdir.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -5,7 +5,7 @@
+ BUILDDIR = $(PKGDIR)/BUILD
+ RSPEC = doc/$(PACKAGE).spec
+ PNAME  = $(PACKAGE)-$(VERSION)
+-TMPDIR = /var/tmp/$(PNAME)
++#TMPDIR = /var/tmp/$(PNAME)
+ BDIR = $(TMPDIR)-1-root
+ RPMB = rpmbuild
+ # $(RPMB) -bb --buildroot $(BDIR) $(RSPEC)
diff --git a/sys-apps/ipmiutil/ipmiutil-2.9.3.ebuild b/sys-apps/ipmiutil/ipmiutil-2.9.3.ebuild
index 162586109909..82dd903c9401 100644
--- a/sys-apps/ipmiutil/ipmiutil-2.9.3.ebuild
+++ b/sys-apps/ipmiutil/ipmiutil-2.9.3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ipmiutil/ipmiutil-2.9.3.ebuild,v 1.1 2014/06/28 01:05:28 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ipmiutil/ipmiutil-2.9.3.ebuild,v 1.2 2014/06/28 14:20:18 jer Exp $
 
 EAPI=4
-inherit autotools systemd
+inherit autotools eutils systemd
 
 DESCRIPTION="IPMI Management Utilities"
 HOMEPAGE="http://ipmiutil.sourceforge.net/"
@@ -12,13 +12,17 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~x86"
-IUSE=""
 
 RDEPEND=">=dev-libs/openssl-1:0"
 DEPEND="${RDEPEND}
 	virtual/os-headers"
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-flags.patch
+	epatch "${FILESDIR}"/${P}-tmpdir.patch
+	
+	sed -i -e 's|-O2 -g|$(CFLAGS)|g;s|-g -O2|$(CFLAGS)|g' util/Makefile.am* || die
+
 	eautoreconf
 }