summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2014-06-28 14:20:18 +0000
committerJeroen Roovers <jer@gentoo.org>2014-06-28 14:20:18 +0000
commit45c37a779edf07481eeb4398ab3161294be10efe (patch)
tree14a91ce5556ff978bb23fd1128eefc62bec14959 /sys-apps/ipmiutil/files
parentVersion bump and remove older versions. (diff)
downloadgentoo-2-45c37a779edf07481eeb4398ab3161294be10efe.tar.gz
gentoo-2-45c37a779edf07481eeb4398ab3161294be10efe.tar.bz2
gentoo-2-45c37a779edf07481eeb4398ab3161294be10efe.zip
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)
Diffstat (limited to 'sys-apps/ipmiutil/files')
-rw-r--r--sys-apps/ipmiutil/files/ipmiutil-2.9.3-flags.patch20
-rw-r--r--sys-apps/ipmiutil/files/ipmiutil-2.9.3-tmpdir.patch11
2 files changed, 31 insertions, 0 deletions
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)