Respect LDFLAGS. Bug #332297

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

diff --git a/sys-apps/tomoyo-tools/ChangeLog b/sys-apps/tomoyo-tools/ChangeLog
index ac8396a8d0a603022c80e573fb81bd5b95829646..3ea95f046e603a3ea8e6743392d5f902853a4689 100644 (file)
--- 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/Manifest b/sys-apps/tomoyo-tools/Manifest
index baddba105551017b1b20d0b818ec6c3e50a5aeb8..b707eb3fca0e9a84935527311209a8f68bf0a3b8 100644 (file)
--- a/sys-apps/tomoyo-tools/Manifest
+++ b/sys-apps/tomoyo-tools/Manifest
@@ -2,21 +2,22 @@
 Hash: SHA1
 
 AUX tomoyo-tools-2.2.0_p20110211-gentoo.patch 708 RMD160 04f0ebfc9520bcc9c4c93632ea8bd48c2b97dc07 SHA1 f7b75000a1eee52edd65a310af5e16344736c9ee SHA256 5f14654b236a43acd8e8d71ece53f71df41a542b33fbe265bf2bee0989714d98
+AUX tomoyo-tools-2.2.0_p20110211-ldflags.patch 560 RMD160 e9139af35409591d2aaa015cebe144691886213b SHA1 20a2a58d9690b32a11e2678fcbb0d35ac34c80b2 SHA256 dc7891c3229302968ef09047af468d09f3444a7fae38e042cd685c680844bd3a
 AUX tomoyo-tools-2.3.0_p20110929-flags-parallel.patch 3060 RMD160 9db2e8941cc6b80a363799a03b6eaa9358763599 SHA1 8840cca8978379c376450ab0a6e7827b5cd37fd3 SHA256 4a358394d49bdc83a710f90e40bd504c9695212c45ffc2385fab900d31d6c97e
 AUX tomoyo-tools-2.3.0_p20110929-gentoo.patch 724 RMD160 8b20b0fdc821ba72fa2495b8f48b086c1f7eb71d SHA1 4dbbe71e0f78bd51272ae4271093302e1403246d SHA256 864aeee12e99961b7ee7706cbc74db7de149177ddaca20da4a627fa71c6026c6
 AUX tomoyo-tools-2.4.0_p20110929-flags-parallel.patch 2676 RMD160 1b8ba9d0406bc436b1cdc63a599522b4cea36e55 SHA1 14224fe1c45ef5884b55fb48e6e36191286f3c4d SHA256 9d8157d6365739009901e2ef8b8e20b14901564cb1c2211f69be0fac39cfc5ad
 DIST tomoyo-tools-2.2.0-20110211.tar.gz 78043 RMD160 39d9578bdda4bb206880f00b95c390fa5a301a35 SHA1 f593b101d105ee5d9b53670ed58944199a6190aa SHA256 9788d5e61430ab8b1c990baabe640b43807366e121723f7b3bb0d88589bf1e9e
 DIST tomoyo-tools-2.3.0-20110929.tar.gz 115875 RMD160 2c5584039b181e25b25e7700ec72fa3014316eda SHA1 3e76e585ce897608e3f1004d8cbfe0dfebe9f744 SHA256 484a41d48c358c117757b8ad6af6a4fe85bc6b0cfe6dd6565bb92d3d9daee70e
 DIST tomoyo-tools-2.4.0-20110929.tar.gz 166922 RMD160 cee0456d75283e05c19860f35b9c4bc470d9cd73 SHA1 db1d667385df515d2cb9cd9305e1678f12a07ee4 SHA256 c18efcfbbeb0cbcb509afff02e9b8681bf8e40fe952ae8a5025a6e66c743e856
-EBUILD tomoyo-tools-2.2.0_p20110211.ebuild 1557 RMD160 e35478c2a83098847622f907eb8c38ce4c15f56b SHA1 96820756459ec3ed0daf504e46f3979b833d0406 SHA256 fe33cf7a9a6491a6c760d9e2c14b111ea6629249604fa64cdec09c8716c850e4
+EBUILD tomoyo-tools-2.2.0_p20110211.ebuild 1598 RMD160 46569b6927a172a2b8264fd91a1d4a0afd6faf44 SHA1 f421e0b3f9046b1591059d8bee48afe927712457 SHA256 60c0e099e022644c78fdc41dfed17878043cf8a85bca4bfaae336b3bc134dcd7
 EBUILD tomoyo-tools-2.3.0_p20110929.ebuild 1760 RMD160 56ecfe9a088a53a13e6f38020ef6ef283f9f5e48 SHA1 1db52ef6ac1df12dcc19254f399905cdec479d0d SHA256 33105558ef288e4711ce13d3f194589274b01e9ad06c13b307da546c23766e75
 EBUILD tomoyo-tools-2.4.0_p20110929.ebuild 1432 RMD160 a00089d5973b2d46b0c2e6f333f0990b96e770a3 SHA1 c5b7e9248c63ab260b3f3f69adec802e75f75b1a SHA256 e2d67964bd486bf0fe55d91ce58b94f57dddefa325fefdb2253aa8fa4cf62a36
-MISC ChangeLog 2137 RMD160 3db976ff9fcf70d3acaaa4894dd0db538c66aab7 SHA1 24b39344b8db942dc380c73d80e6ea5d6dfc2306 SHA256 9af9448ddb24ae80f9b4561ab445dc8dd5bf58b89644bad9242a983ced1317fa
+MISC ChangeLog 2308 RMD160 7b83c5df2742ea64e5aeeb4e2e57624e61ce84a5 SHA1 027875563407d65797bd17be09e0fa7c8d8c64f9 SHA256 fbc77857627ee4b3693f341e5ec7c8ed6774f28ed7d3df7fcbd36d9c20072bb8
 MISC metadata.xml 259 RMD160 22f85d140355c094c3aee2a5c5a823bd0f3fe888 SHA1 09eb7d683c41add3d3fc85fc6c283c0619e61ed3 SHA256 5afc0793a91f3fc43b4d21375ad710fac25f1296ea782c453e512c9363f60187
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6E9KAACgkQGpDnPLSHuMBI7QCg2Y2ZETcUOi3xPzo+ByRnAbMu
-c44AoLKxEvQpuKJHhZPdEGV52unSKbXP
-=OxSy
+iEYEARECAAYFAk6E9mkACgkQGpDnPLSHuMA0fgCgpf6rUFujVeyXQ/nxq3azMD/q
+4osAoOcrMaLvMVl2TBUfJ7Cld13FsaFV
+=qAdZ
 -----END PGP SIGNATURE-----

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 (file)
index 0000000..d0ea10a
--- /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 010354d2950a8a3afee6476a5b591ca2e86836b5..bcf5ff2aa33fafbf6260a95b43807f49f0a135d4 100644 (file)
--- 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):" \