summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNaohiro Aota <naota@gentoo.org>2011-09-29 22:51:17 +0000
committerNaohiro Aota <naota@gentoo.org>2011-09-29 22:51:17 +0000
commit972d45b8b567f8178aa3b039869ba30e5ce9f128 (patch)
treebe59078216ec09ccb93d5a15fa819cdfdc2e7d51 /sys-apps
parentVersion bumped. Bug #355823 (diff)
downloadgentoo-2-972d45b8b567f8178aa3b039869ba30e5ce9f128.tar.gz
gentoo-2-972d45b8b567f8178aa3b039869ba30e5ce9f128.tar.bz2
gentoo-2-972d45b8b567f8178aa3b039869ba30e5ce9f128.zip
Respect LDFLAGS. Bug #332297
(Portage version: 2.2.0_alpha59/cvs/Linux x86_64)
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/tomoyo-tools/ChangeLog7
-rw-r--r--sys-apps/tomoyo-tools/files/tomoyo-tools-2.2.0_p20110211-ldflags.patch17
-rw-r--r--sys-apps/tomoyo-tools/tomoyo-tools-2.2.0_p20110211.ebuild3
3 files changed, 25 insertions, 2 deletions
diff --git a/sys-apps/tomoyo-tools/ChangeLog b/sys-apps/tomoyo-tools/ChangeLog
index ac8396a8d0a6..3ea95f046e60 100644
--- a/sys-apps/tomoyo-tools/ChangeLog
+++ b/sys-apps/tomoyo-tools/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sys-apps/tomoyo-tools
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/tomoyo-tools/ChangeLog,v 1.6 2011/09/29 22:43:40 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tomoyo-tools/ChangeLog,v 1.7 2011/09/29 22:51:17 naota Exp $
+
+ 29 Sep 2011; Naohiro Aota <naota@gentoo.org>
+ tomoyo-tools-2.2.0_p20110211.ebuild,
+ +files/tomoyo-tools-2.2.0_p20110211-ldflags.patch:
+ Respect LDFLAGS. Bug #332297
*tomoyo-tools-2.4.0_p20110929 (29 Sep 2011)
diff --git a/sys-apps/tomoyo-tools/files/tomoyo-tools-2.2.0_p20110211-ldflags.patch b/sys-apps/tomoyo-tools/files/tomoyo-tools-2.2.0_p20110211-ldflags.patch
new file mode 100644
index 000000000000..d0ea10af002a
--- /dev/null
+++ b/sys-apps/tomoyo-tools/files/tomoyo-tools-2.2.0_p20110211-ldflags.patch
@@ -0,0 +1,17 @@
+diff --git a/Makefile b/Makefile
+index d84a02b..e1cb36b 100644
+--- a/Makefile
++++ b/Makefile
+@@ -39,10 +39,10 @@ CFLAGS=-Wall -O2 -pipe -fomit-frame-pointer -march=core2 -mcx16 -msahf -maes -mp
+ sleep 10
+
+ tomoyotools: tomoyotools.src/*.c tomoyotools.src/*.h /usr/include/curses.h
+- $(CC) $(CFLAGS) -o tomoyotools tomoyotools.src/*.c -lncurses -DCOLOR_ON
++ $(CC) $(CFLAGS) $(LDFLAGS) -o tomoyotools tomoyotools.src/*.c -lncurses -DCOLOR_ON
+
+ .c:
+- $(CC) $(CFLAGS) -o $@ $<
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<
+
+ clean:
+ rm -f $(MAIN_FILES) $(MISC_FILES)
diff --git a/sys-apps/tomoyo-tools/tomoyo-tools-2.2.0_p20110211.ebuild b/sys-apps/tomoyo-tools/tomoyo-tools-2.2.0_p20110211.ebuild
index 010354d2950a..bcf5ff2aa33f 100644
--- a/sys-apps/tomoyo-tools/tomoyo-tools-2.2.0_p20110211.ebuild
+++ b/sys-apps/tomoyo-tools/tomoyo-tools-2.2.0_p20110211.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/tomoyo-tools/tomoyo-tools-2.2.0_p20110211.ebuild,v 1.1 2011/09/29 22:15:13 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tomoyo-tools/tomoyo-tools-2.2.0_p20110211.ebuild,v 1.2 2011/09/29 22:51:17 naota Exp $
inherit eutils multilib toolchain-funcs
@@ -25,6 +25,7 @@ src_unpack() {
cd "${S}"
epatch "${FILESDIR}/${P}-gentoo.patch"
+ epatch "${FILESDIR}/${P}-ldflags.patch"
sed -i \
-e "/^CC=/s:gcc:$(tc-getCC):" \