fixed cross-compiling, bug 516854, with Poly-C's blessing

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x2B6559ED

4 files changed, 36 insertions, 12 deletions

diff --git a/sys-libs/e2fsprogs-libs/ChangeLog b/sys-libs/e2fsprogs-libs/ChangeLog
index cdfb589accd3..ee632e8ae820 100644
--- a/sys-libs/e2fsprogs-libs/ChangeLog
+++ b/sys-libs/e2fsprogs-libs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/e2fsprogs-libs
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/ChangeLog,v 1.115 2014/07/09 11:12:53 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/ChangeLog,v 1.116 2014/07/10 19:05:02 axs Exp $
+
+  10 Jul 2014; Ian Stakenvicius (_AxS_) <axs@gentoo.org>
+  +files/e2fsprogs-libs-1.42.10-fix-build-cflags.patch,
+  e2fsprogs-libs-1.42.10.ebuild:
+  fixed cross-compiling, bug 516854, with Poly-C's blessing
 
   09 Jul 2014; Mikle Kolyada <zlogene@gentoo.org> e2fsprogs-libs-1.42.10.ebuild:
   amd64 stable wrt bug #516114
diff --git a/sys-libs/e2fsprogs-libs/Manifest b/sys-libs/e2fsprogs-libs/Manifest
index 1490d7fd9567..c3f49599ee20 100644
--- a/sys-libs/e2fsprogs-libs/Manifest
+++ b/sys-libs/e2fsprogs-libs/Manifest
@@ -1,23 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX e2fsprogs-libs-1.42.10-fix-build-cflags.patch 370 SHA256 11871291de4605c6a469327e698e51a611c786451ef3ecedf20bcdef75c9e50a SHA512 a268390656dbc6ff5217efce5d38686de70de8d2c566b117a53c42fd829178ab07f300e10017623dc3931084214ded620e05500992ff8371d47c2d90764f58b7 WHIRLPOOL be6a71d843a1f9250e0fcb4ffc7ac0d4c2eb5e56749bbb9fa4da6eed181270c3cff2a36241738beb959959bb9de8ceba079cbdde844f16d5e302c4ab84eb2e71
 AUX e2fsprogs-libs-1.42.9-no-quota.patch 1247 SHA256 a7d8029934ad38e59c29ce641d49697a013f840b116e2d26fc12f78c8d03850e SHA512 32ece07e83911c1f9be76e7ecd57f6876dec864cdc5398d277dd83829b91e316835732156993cc23b580d6cdeb35ee7cc1b5c1cb1b6e0971f9b956b344845fe1 WHIRLPOOL e544cf281884c8a110d5958cabda2b7cf4b262025d57bcdcc5bd5786465d56d5c81ef0346b69ffa532ed89fb9e631c23ce0cc05e0871199103e70253686d9fbc
 DIST e2fsprogs-libs-1.41.7.tar.gz 494463 SHA256 b6d9c9ec405ad1d644cf35d57f0f1e878fa6af6ad45b97683de847ff49cbdf84 SHA512 01bf6571efc3b63b985bb45190553cbf0e486ddcf022715a2bdf36eb3e45ffada603ed52bf17d6920b9dc3e98ffc6758d2481a83b68bbf5d946c76173f7d14a8 WHIRLPOOL 058fc1278ff2427d956728ad2d132652e80b60570c20c904c6d6e2a15c4a9d00ec13340ad56114f82dd703ee87cd576c2f69eb3d40f1f16743430476c3e383b1
 DIST e2fsprogs-libs-1.42.10.tar.gz 575703 SHA256 236ea5124ae7c2a0d0bc4bc5927e614a52da2635fbc3b2187ca8bc415bb3644d SHA512 97be305df2debad3378f53ffa702e0719e76f9541c38468c78c32e77765fb0ae95b927dca4d5032268346792e759cf02ab9542c9e08c0b9f58ddd5276e2e0362 WHIRLPOOL 30b8df6b6fa29449d5ec90c435fc1f234d0e59d6012015a00c603139f400ad46708cd444c88e3693247703171d3e65275c3204d7d5f53305b7a412fc7d6cfbd5
 DIST e2fsprogs-libs-1.42.7.tar.gz 571544 SHA256 21ce9cd879c401d08b057a9abda2b56d70557239d1f5e42674fa2c20509c2145 SHA512 2ffd37edd156730d2cc5c685e0d082c171ada626ced40a86623d937522fd020c9215fa287de909968cab366ad8a1aa84a6de8e4eaf3fc1effb103000448bae0b WHIRLPOOL 12d4f309feadd957317f97f44c9c8cf5552ed27e0f22e2061d39e8abd2732fd512f38127a0806bc913ba92c64894218efcebda1316d74b6a814bf7f6f94152df
 DIST e2fsprogs-libs-1.42.9.tar.gz 574130 SHA256 87778c5816bfab40cd5b1c64725b4f4c94c9cca42e74b6937211fbf6f3509667 SHA512 e68f9aef3415e95db85980c1677fb6c71338b69858a386e5eabab208121b0c26b37a2ceb9b60368492d365ab4161522dff0ba74cc69030d9bc5b4819762a9aed WHIRLPOOL da5ed2b45e01dbb836c9b7fafed0105329e883fdcd5915419886173be66956a240a2581c0517fc9dd1c5513be668ae9e416d46c5bde00b447c4624980872ce78
 EBUILD e2fsprogs-libs-1.41.7.ebuild 1375 SHA256 1d0cb56ff0730d1e7ad90825df12610c3d869b6b830e5c85401b005b8b61432c SHA512 057f80553e38cd72a81621f8691fd8fd59f26542ad1205c7896992537e86fce584bfc309110bb2267ffe5109ddca07d248fa34b0c05cf0eca41602eab9aaf8a6 WHIRLPOOL f9373e687b343912c5442488fb90a95dfcb322232cc15a6b39ce8bda09e1c592a1d98ec141356c841f695b14dc75e2e5829c8d31f4776f2540edbdad36324150
-EBUILD e2fsprogs-libs-1.42.10.ebuild 1832 SHA256 c57583803a1d14ec9b9a1a2556c0750ee7baa27900bdaaab2ad9b299ac91baa3 SHA512 7c8f178c2e720aa5368b27c768cc17973b8d86739d220a68bf1692cdefb880d9bd84b52dc7f09bd55e36b5aee3594b843906c7aba85bc8fe86c48ebe7c163e09 WHIRLPOOL fb4b4e0dd728712791991efb51a1079fd5c44fb082cf4a340193e50d4f2ca6161bf6e3525fa3f9d85dd321001e5d01dd3c49be71a131061c1041107f27450e76
+EBUILD e2fsprogs-libs-1.42.10.ebuild 2028 SHA256 11cb2006704b28a7c7a53c8f1acef27850dc5e478036e47eaf0db74a89eb56f7 SHA512 9fb748b63255db9ad37ff186553ae43d1a3a21e19307e189060dc4bbc441c2f1f94b0f5ed5667230d9af3e20027d11d632744f132302420c584d4fedeb1d2cf1 WHIRLPOOL 55ab171426ec349a28baa58ffa0611488c11d94561428f7b9c71e09ca57a81b3753c8337f4cdc4dbe2a4ded8f0b2dd4b4268d634c486d166717a5514c65a2684
 EBUILD e2fsprogs-libs-1.42.7.ebuild 1741 SHA256 7dd297867ba5761579b258217f5eb537a769a7347d59da362b02aafcd1e7f725 SHA512 87096aa2a4fa5f7aa786c5f05fe8a27775e3c51f57c3c0a21e42e8478026aea745bf50335a3c1ccfb75e74de5df3b61311549fcea403d8e1abf9bb2d0bbe6bb1 WHIRLPOOL b611adabcf9c0160ec77c25edb2ad588cd4f1c49e56e5a0ad95388c9a36d422737c16f9e73e1bcb4e76c6e4a60a338ad253f038aff41830404893de67412d70f
 EBUILD e2fsprogs-libs-1.42.9.ebuild 1831 SHA256 7f6c52bcdbdcd54a30e261918065e67109fb81aa8c97bd3117e9b98dcb798788 SHA512 25d5fb5ebec5e469309e97dcfee00c87ec6ebb16347d097c5359b7e66e8010b139051fb911d18a01c5912a55786877d767b7aa4b506b6618a6da8d396713f775 WHIRLPOOL 598f3af104b83aeeb05be57c281b7dc4513fd63a228b989c8ad9ca44e449df7af9bb1abd8df4cb103e496dc018a400d73f27bb448d5cdcc719cad72ea63733cb
-MISC ChangeLog 16298 SHA256 20d70f922ec1d582f3e819ceea9586881bc1591bd0149157b1f7f5f55ab3a26e SHA512 26aba1e3697fa0dc758b1df4723c2f9be13b5db68f7cbfb2540f30bb9656a1ac01e49fc7d3fe13e0a76f2d7894083774c31f369e798f23edd8f3a832f45515d1 WHIRLPOOL 55d266c921a191e0d672eba8b148b2ca7c0b7f9479d7bb370b29ef00ce1c8b0b10b3b82b6c36bdf68993aebf185acb82a695e13ecd821bdab9c9bd6572b6d37c
+MISC ChangeLog 16501 SHA256 4236a1461886ff13531dab288a32ae39a5d9cbc04f86ce6fc4b718fe941f75b0 SHA512 a949322d051e99b6d3c64a1152f8c158b948707b847e67eb55196f87b539c0c702da521bcb4039a104c0ea78e985b966e0b38a3143e616e56dd393b7e9d0b3bc WHIRLPOOL 13d05e49bf9a142b89d6568a94b38473e59fbfdac8385566dbfecee6cd2f275d46e932ea458a163b01f0e48202b7a2a53fb611648e7f957df2344811bcb3d9c3
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iJwEAQEIAAYFAlO9JPQACgkQG9wOWsQutdb9GgQAj0DHFB4wQQ9gWCbrtZaVJCR0
-EjtR2G0Dqap2OQzjGf9zi6zlkohBxtdpI3CBqNVKWSNTu15JLDcHbfIGnr4stBgI
-sxmvWTbuxbOColp0yNOcxh+Zm2TwAFR++VYmBytwwFLvun5xCcnJLVnbf3WEvEsV
-GuGPVe6R3UEzmIZcDFM=
-=51+K
+iF4EAREIAAYFAlO+498ACgkQ2ugaI38ACPARPQD+IN+hLz5MXYG5A1tmB3Sh0+iC
+Lh36nmCQ/Rdg+uWd/UAA/RmNyuQXYeiCTWEPjycD33L3O6VsyrJ16M2ssqlSwvid
+=0VrH
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.10.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.10.ebuild
index 330c5eb627da..e9e50aacd4d3 100644
--- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.10.ebuild
+++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.10.ebuild,v 1.2 2014/07/09 11:12:53 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.10.ebuild,v 1.3 2014/07/10 19:05:02 axs Exp $
 
 EAPI="4"
 
@@ -9,7 +9,7 @@ case ${PV} in
 *)      UP_PV=${PV} ;;
 esac
 
-inherit toolchain-funcs eutils multilib-minimal
+inherit autotools toolchain-funcs eutils multilib-minimal
 
 DESCRIPTION="e2fsprogs libraries (common error and subsystem)"
 HOMEPAGE="http://e2fsprogs.sourceforge.net/"
@@ -35,6 +35,8 @@ S=${WORKDIR}/${P%_pre*}
 src_prepare() {
 	printf 'all:\n%%:;@:\n' > doc/Makefile.in # don't bother with docs #305613
 	epatch "${FILESDIR}"/${PN}-1.42.9-no-quota.patch
+	epatch "${FILESDIR}"/${P}-fix-build-cflags.patch
+	eautoreconf
 }
 
 multilib_src_configure() {
@@ -43,6 +45,9 @@ multilib_src_configure() {
 	ac_cv_lib_blkid_blkid_get_cache=yes \
 	ac_cv_path_LDCONFIG=: \
 	ECONF_SOURCE="${S}" \
+	CC="$(tc-getCC)" \
+	BUILD_CC="$(tc-getBUILD_CC)" \
+	BUILD_LD="$(tc-getBUILD_LD)" \
 	econf \
 		--disable-lib{blkid,uuid} \
 		--disable-quota \
@@ -51,8 +56,12 @@ multilib_src_configure() {
 		$(use_enable nls)
 }
 
+multilib_src_compile() {
+	emake V=1
+}
+
 multilib_src_install() {
-	emake STRIP=: DESTDIR="${D}" install || die
+	emake V=1 STRIP=: DESTDIR="${D}" install || die
 	multilib_is_native_abi && gen_usr_ldscript -a com_err ss
 	# configure doesn't have an option to disable static libs :/
 	use static-libs || find "${ED}" -name '*.a' -delete
diff --git a/sys-libs/e2fsprogs-libs/files/e2fsprogs-libs-1.42.10-fix-build-cflags.patch b/sys-libs/e2fsprogs-libs/files/e2fsprogs-libs-1.42.10-fix-build-cflags.patch
new file mode 100644
index 000000000000..ff68590521fa
--- /dev/null
+++ b/sys-libs/e2fsprogs-libs/files/e2fsprogs-libs-1.42.10-fix-build-cflags.patch
@@ -0,0 +1,11 @@
+--- a/e2fsprogs-libs-1.42.10/configure.in	2014-05-15 13:04:08.000000000 -0400
++++ b/e2fsprogs-libs-1.42.10/configure.in	2014-07-10 13:39:21.374156802 -0400
+@@ -1328,7 +1328,7 @@
+    BUILD_CFLAGS="$CFLAGS $CPPFLAGS $INCLUDES -DHAVE_CONFIG_H"
+    BUILD_LDFLAGS="$LDFLAGS"
+ else
+-   BUILD_CFLAGS=
++   BUILD_CFLAGS="$INCLUDES"
+    BUILD_LDFLAGS=
+ fi
+ AC_SUBST(BUILD_CFLAGS)