ohnobinki_overlay Changeset - fe2d15dbee1b

Changeset - fe2d15dbee1b

Parent rev.

Child rev.

[Not reviewed]

default

0 2 1

Nathan Brink (binki) - 14 years ago 2010-12-28 22:27:06
ohnobinki@ohnopublishing.net

sys-fs/mdadm: Fix bug 336175. Also add support for CFLAGS during the linker stage, fixing imminent portage-multilib compilation failure. Also fix extraneous test compilation and incorrect test compilation.

(Portage version: 2.2.0_alpha2-r1/hg/Linux x86_64, signed Manifest commit with key 6BA81050)

3 files changed with 60 insertions and 16 deletions:

sys-fs/mdadm/Manifest

sys-fs/mdadm/files/mdadm-3.1.4-cflags.patch

sys-fs/mdadm/mdadm-3.1.4.ebuild

0 comments (0 inline, 0 general)

sys-fs/mdadm/Manifest

➞

Show inline comments

@@ @@ -4,6 +4,7 @@ Hash: SHA256 @@
 AUX mdadm-2.6-syslog-updates.patch 1117 RMD160 c7de674fc76eb444d1d5f97a5a4c59c955aa51b6 SHA1 c00f4f283acd226241aed07e35133f965bb8b154 SHA256 207fd5ec76829fed5310f766001686807c623fe3eee541701f3366f96ef77b86
 AUX mdadm-2.6.4-mdassemble.patch 465 RMD160 4abcfcd75242d552f674a850ea116835a8f56aea SHA1 609161b594c51644f30de98a7a74473361bdb98b SHA256 015321cbb219f80444c9d56d01bde36f828d2814c57712a7655bdbae811ff8c4
 AUX mdadm-3.0-dont-make-man.patch 278 RMD160 a0275251626d91dc53b3fadfab6543961f5d7608 SHA1 0c74b7f10fab185442654bb965ac557daa567c17 SHA256 bfc42300913a178c3bcd5f9af4c721893224b2741beddcfba6498d012b1d5679
 AUX mdadm-3.1.4-cflags.patch 1069 RMD160 a2717d08d3dc593c7a28792100985ff92c1e469e SHA1 9c9a938601155aa09871817a7b58a9a2f07449ae SHA256 761e2d0199e7315a6d6b2825cabc1ffb9086c8038d5d4d3679dff7cbc6a55867
 AUX mdadm.confd 205 RMD160 9b4af661ef05e6dbab9ead55506a1ef0670a9076 SHA1 46d75372ecfcfcb34b1576bd994c22cae24f2a79 SHA256 ec55674955af7a31da51b8b72b599e8519809287dad796a9b16155bcba471b79
 AUX mdadm.rc 574 RMD160 69640d0b1fbd11bd7078c0e7791d247420653b73 SHA1 39044e7d6ad63c44669baf9775230670f04b201c SHA256 3073b14619cb7b2c99c33f2d6cfd1e59ce5557899bffebaa65fa52f3caffadc7
 AUX mdraid.confd 225 RMD160 944896151ffdaf7b172c8d045d3cf9bd9083fabd SHA1 41b2e6441e1bac71657290a6764774fb0d452721 SHA256 1b7918c4bdd024607bcb49d7cea0a77cb70502d2fbb4dbe07024bb5b5699c8e0
@@ @@ -12,22 +13,22 @@ AUX mdraid.rc-3.1.1 815 RMD160 df283e9b5 @@
 AUX raid-start.sh-3.0 799 RMD160 6495c44ea5be6e18a2b76e0c724f2dbf36073f90 SHA1 2df50d9f03cc907990ddd4b235dbc605c3e208c8 SHA256 7f4e6b5d148578f417bcc05d4d4d5c65641c2a810b74b2f7f43b808c7c52a9ce
 AUX raid-stop.sh 645 RMD160 a2855fbdad1222044a9de5b7a9f441592d42960b SHA1 daa2052a3835ca178005a96a3675759a96119203 SHA256 167a6bd452b5831cd5235eb80bf5f91bb2e5a10db132408fce29e60eb9d200db
 DIST mdadm-3.1.4.tar.bz2 288578 RMD160 f41a2be4158efac08dbe2e95f1c6812609475fad SHA1 4ee43922d38b15a930daaaa026ef1b4efacdbc8a SHA256 849ad0ad4ad3c1d2d8806a16b30e1f59ab2daf313cb103807207f7cba889ea63
-EBUILD mdadm-3.1.4.ebuild 1963 RMD160 4a58c543194ab9e512ad20f4d7fab086cc9fc60e SHA1 85fa709d61a1fd63ab219bccb7800b87b9aa073a SHA256 6f273ecc3f0425f58b444150a3bc67a233b33c0fb7b2ca01c5be3a1ff5770b46
+EBUILD mdadm-3.1.4.ebuild 2298 RMD160 b4bdaa9e128fec3ce3183f4655189df067aeb600 SHA1 3819a3c639a24405071dd14aa3bdec67d649ad86 SHA256 3955d45ae92b393d646cf0eee90f8122d1319a8a3fd1dfec51d1dfec5cf47283
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 iQIcBAEBCAAGBQJNGqVIAAoJEHQ6UuhrqBBQqFEP/REitgZWNIX9vzK73goCjQMm
 K7ZtdVOOEb1XrhYTyePMASbGba0Lerx7KZvnyKx8st2n/i+MoZ7upcikrewn8r1G
 gxdg2/FEieauJeLMPpjFovsP63BO5l3uH1Eau4/eWUIXxqoC0kgPLjPzcyZ7G6IQ
 YK7w1g0FCWq1va2ZImcnhN+vEQziuSIxgS+on8ynnbJbkLSYKtnlgEOYekyXjDHv
 cic8W6R8Y8IcY3XaYdHhEu7fwTruRnhNGeHUDio9sYfk4R07vTNFjzngvIW8cjTv
 IyzDyMFKEbpOMp75AmWPcUfxxYaVLmp6DFdg9KQqKT8akbs0+tuR648QI0m6T3Ub
 xBFhC8S8SyjkgKwcM1cH4MebTtd5UZGW1yAeDy/pciggQodCq+dRNFZq8qaMWHgd
 MZfRAGoJW4LGuSGzfr3ld5Gn6ZJoHMrs8crqm7tZ7Ug2iPKrt6A2/ki0cwXq3pRf
 jdsCxh82NeoploBNcFl5UBK/1+JExksVaXvVY0Pffo9rXLeqL/+QgaFTragJfLF0
 iCg13Z+FCGR8XNKXHKRopI/7ay4UjBqrOfX7Eo4boOx4kgWtqUY0fJzP3+rzQPCb
 vSHhDL+L70DWKfbgmUIGnA7LnpvLaE2+XRAwK3dOJQHurQHrgGUJagjlGLv3Wuq7
 GVHkOqTAlyzomi9fw7/
 =nCE4
 iQIcBAEBCAAGBQJNGqqKAAoJEHQ6UuhrqBBQYwEP/RZB7mq5cWjrUk1aPjR0H8+Z
 KjpaNcI8IKFrx0zFSusSkwP2A42rJtt6VOHBguRjLsZzWz8l3eAz8yI60RFSv0eY
 XTbHO5ihqiLFL4tu70nTrE5BIpvyFe+61GnPhPftPZQUiJvD8yetsw7PyXx1mjnL
 JtKqiXdd2ISr8VLb6rY3OhARD6Of5/R4bagSdPrx9BK9wcwH9vChXUW9DpjkDJ4o
 ssiaLVaznt0uilVtGfJ7XFCygTV/Rtiug7aeiWZ1SQuveUTKmPJ7nGD3p73OP
 QMY/9zw8pDMuGrHNVh3za5JGM5wZT9mfE317Mz1UThF1TlitFamrpUaOqsGO4Gwr
 +2nuB7DYeWk8mv1nkmB967TmEthaZ948gbcZY9A8NeT1Y8/oGMO0XQFhfbqptX3e
 QCSS2qly5ab+tF4lqIkTU1MtbaRQuniX0ZTWkLxw2qneZCV7LhMr0K8Q0OkpsL9I
 HrlpoPPKZwSOmDhK9+w3HBvQOQwT04/rQEmvP2XNoqcc7ungDUh2ssxmc4Fva24c
 Mbg5LHb3CBCLdhyoq/Pm6SG63KgsVVWbf4rhvmN8Valk//y3jHr7Ij90xrQp9wpB
 RRUQgB16WTcKMyRlZOAW1YqfJZSMWRhOTD4R72qRxqhLaEDDgx4dnqQWBYLZPJoJ
 JE/KeUSnBVR7yi4Bdk6k
 =LoEL
 -----END PGP SIGNATURE-----

sys-fs/mdadm/files/mdadm-3.1.4-cflags.patch

➞

Show inline comments

@@ new file 100644 @@
 # HG changeset patch
 # User Nathan Phillip Brink <ohnobinki@ohnopublishing.net>
 # Date 1293590270 18000
 # Node ID 6d6117aa0da18aa3af0ca28f7e3537f304998f2c
 # Parent  2d23479cb9e66efae0b5816ba68a827f7fd7d035
 Use CFLAGS when using the compiler driver during the linking stage. Fixes Gentoo portage-multilib compilation failure.
 diff -r 2d23479cb9e6 -r 6d6117aa0da1 Makefile
 --- a/Makefile	Tue Dec 28 21:33:11 2010 -0500
 +++ b/Makefile	Tue Dec 28 21:37:50 2010 -0500
@@ -144,7 +144,7 @@
  # mdadm.tcc doesn't work..
  mdadm : $(OBJS)
 -	$(CC) $(LDFLAGS) -o mdadm $(OBJS) $(LDLIBS)
 +	$(CC) $(CFLAGS) $(LDFLAGS) -o mdadm $(OBJS) $(LDLIBS)
  mdadm.static : $(OBJS) $(STATICOBJS)
  	$(CC) $(LDFLAGS) -static -o mdadm.static $(OBJS) $(STATICOBJS)
@@ -167,7 +167,7 @@
  # use '' to guarantee no dynamic linker interactions with the monitor thread
  mdmon : $(MON_OBJS)
 -	$(CC) $(LDFLAGS) $(MON_LDFLAGS) -z now -o mdmon $(MON_OBJS) $(LDLIBS)
 +	$(CC) $(CFLAGS) $(LDFLAGS) $(MON_LDFLAGS) -z now -o mdmon $(MON_OBJS) $(LDLIBS)
  msg.o: msg.c msg.h
  test_stripe : restripe.c mdadm.h

sys-fs/mdadm/mdadm-3.1.4.ebuild

➞

Show inline comments

@@ @@ -2,7 +2,7 @@ @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/mdadm-3.1.4.ebuild,v 1.8 2010/11/09 19:17:44 armin76 Exp $
 inherit eutils flag-o-matic
+inherit eutils flag-o-matic toolchain-funcs
 DESCRIPTION="A useful tool for running RAID systems - it can be used as a replacement for the raidtools"
 HOMEPAGE="http://neil.brown.name/blog/mdadm"
@@ @@ -16,26 +16,41 @@ IUSE="static" @@
 DEPEND=""
 RDEPEND=">=sys-apps/util-linux-2.16"
 RESTRICT=test
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${PN}-3.0-dont-make-man.patch
 	epatch "${FILESDIR}"/${PN}-2.6-syslog-updates.patch
 	epatch "${FILESDIR}"/${PN}-2.6.4-mdassemble.patch #211426
 	epatch "${FILESDIR}"/${P}-cflags.patch
 	use static && append-ldflags -static
 	sed -i -e 's:-z now::' Makefile || die #331653
+}
 src_compile() {
 	# set CC to prevent CROSS_COMPILE paradigm from being used.
 	emake \
-		CROSS_COMPILE=${CHOST}- \
+		CC="$(tc-getCC)" \
 		CWFLAGS="-Wall" \
 		CXFLAGS="${CFLAGS}" \
 		all mdassemble \
 		|| die "emake failed"
+}
 src_test() {
 	emake \
 		CC="$(tc-getCC)" \
 		CWFLAGS="-Wall" \
 		CXFLAGS="${CFLAGS}" \
 		test || die "emake test failed"
 	# are these tests dangerous? I'm not willing to try them. --binki
 	sh ./test || die
+}
 src_install() {
 	emake DESTDIR="${D}" install || die
 	into /

0 comments (0 inline, 0 general)