From: Sven Vermeulen <swift@gentoo.org>
Date: Wed, 4 Mar 2015 16:00:33 +0000 (+0000)
Subject: Fix build failure on x32 (bug #541618)
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=aa2dcd3e837e0c0f2d0fbb0be4ca00c9382b7b3d;p=gentoo.git

Fix build failure on x32 (bug #541618)

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x2EDD52403B68AF47
---

diff --git a/sys-apps/checkpolicy/ChangeLog b/sys-apps/checkpolicy/ChangeLog
index fbc5ec69fac3..54a13d71fc6d 100644
--- a/sys-apps/checkpolicy/ChangeLog
+++ b/sys-apps/checkpolicy/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/checkpolicy
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/checkpolicy/ChangeLog,v 1.84 2015/02/04 17:55:33 perfinion Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/checkpolicy/ChangeLog,v 1.85 2015/03/04 16:00:26 swift Exp $
+
+  04 Mar 2015; Sven Vermeulen <swift@gentoo.org> checkpolicy-2.4.ebuild:
+  Fix build failure on x32 (bug #541618)
 
 *checkpolicy-2.4 (04 Feb 2015)
 
diff --git a/sys-apps/checkpolicy/Manifest b/sys-apps/checkpolicy/Manifest
index 6ea5d8053940..8f1eaca123aa 100644
--- a/sys-apps/checkpolicy/Manifest
+++ b/sys-apps/checkpolicy/Manifest
@@ -8,27 +8,25 @@ DIST checkpolicy-2.4-rc7.tar.gz 65125 SHA256 a7f8d44f6276b348ef99e9920c7dfd3a840
 DIST checkpolicy-2.4.tar.gz 65238 SHA256 9bbdac28a88de4c405c769730863f3adcd266adbfa45881a5de67e3a4895bcd4 SHA512 8c5c22d9510305e7f518d1a5818f5b36895210f48835d8d24a43b2d34e79881cebcc8cd588bb663c0613a4f878db125c22a4b4df3d0f63b8fb8f88350abc61cc WHIRLPOOL b717428b4411e526cc47ed2be88d7e7e4d48153404b90d50e510fd0cc10cc0452661d0b6b0cc200bb09ae1cc040ae59aae68a8c748611db3ca4cd262f8e8f932
 EBUILD checkpolicy-2.2.ebuild 1022 SHA256 0ec473da351b94f092f06cdfd506f97c48abb539efc3cc791fcc0b4be1d63145 SHA512 cfb60407488ee37b1844eb216b21ac1440240437cad176955b9689e4744bf23b35326159d0602c4939ffe19659614257c60fdb37eedabb4a02ecbde313eac137 WHIRLPOOL a1894e2759bde98d5bd0bf02f2c76cd78e38536a28b0d0c5f8c2b9a16d6ec1e07e02fd299128a59279ef38d1746a40c4e5100925aa1dabae3e60787d01c9cf3b
 EBUILD checkpolicy-2.3.ebuild 1099 SHA256 da1088f0cb65989b859c8269da0856e552fa0072a87dcef0ed96c024c7a5051a SHA512 f5f1e1a6be77ca36bde1ff940b717ec693a4e18289580524076b12f28614ba08b824d8bd0327e0b9bce6f98993b522f8dca88c3b54b56ce8190202707223cd78 WHIRLPOOL 89b9d09e30066fd72fb209f5cb9704f9089138f6f071884d6906fadf6f5fcb73213ad15c9e25c0858a4f80c80586276b6ec5b5cb30f88643e41ac1877eb94d2f
-EBUILD checkpolicy-2.4.ebuild 1095 SHA256 50111454744b0d9548069724750950ea0668baa83bf8d64bf08597cb60147a24 SHA512 0b619f3f7152442a5292d13e4aa89c1ce53a4efb5020571268a89c1197e419049ff98ecf5458d24dafc0feeb2675276d4bd48aa7207356348b220378801f0ca8 WHIRLPOOL 5c4a4ffd9779528c919d6326edefc1ecb94f184329717aca35033f4f8ff466e308ca018bf06c22d0a406c4aede391d349d79c1a88e2e007c712434a1761364e1
+EBUILD checkpolicy-2.4.ebuild 1125 SHA256 cf8721eff9b55072d489cb64216186335d2b3df967d5d428f5d083545d9c11d2 SHA512 7e9a12b10b65665765718a045343bc036d1cf96d3dff691c5eb702ef99550b262a39ddcceb616e426b5f460fe249b51dd8a6026686c5358af5983aa5a28e37b7 WHIRLPOOL 9d8763bce96bc686eb5d2a57b91ad47e67d9ff5bc9f5d0f1818df157c574395cd56d713f2eac81442e4bb632c17340193ccb3dc0c9c9e871973ba2a530132911
 EBUILD checkpolicy-2.4_rc6.ebuild 1113 SHA256 88c51abd56ecb7bbcfdbbd83f9a2078fc1b745064b0e473b61d3c126bef963fb SHA512 1c0b64218885d0dc97404bb147228f48b05c7b2278259b7d6042f722591920e7cd5521aeca2a77b394397a29a7eea8a42475ff742efb4307bd3453bad97ed019 WHIRLPOOL 41db078139022b3f6bf89300070a5bad2d6b66013ecff1b5c94ba799a1e9e8b046b302db356f342879405a4fca061493f2e34f16a0eead2441cb3e074e9e3434
 EBUILD checkpolicy-2.4_rc7.ebuild 1099 SHA256 942e0c9bf461eddbc1bf7ef66c8e86fa71f35527bca8d8f56dd47436e9a09bbe SHA512 293e99f28a8ec7f3c5ea6c26a111429a6b8f7578a660bd022fd59cdab5b1ab796ba5bf2eba50b1c098d585311beb2ea7c388158bedc2b77430aab62f1b6de1c3 WHIRLPOOL b13b0b3dd63e91c3e799842403e47e9d4359ef914b328f5e321e10cc2eed405fbc0e62937ccf00b9bf03cb809521e4a0024bf57c4b6dfa234ba7069437edd440
-MISC ChangeLog 10921 SHA256 34ad9cd1d33abe829d73449dde8ca1ca63f637b93ea0efa1fc1145b9a4d84d6b SHA512 0ac868e58fec2356464eb4cc31a26bdd70cd8ad659ba9fdb25d08b537f03de1a2f9ccfd180314350fb780e75dad1173056ed17fdc078fbe49cd106e1b72dcaef WHIRLPOOL 18407206e490f4ac4f4062c577fd808c69e80e7cc8b3fdf6d43bda25d782def7e34da92799921f73397a5650026a40262b544ba95958d63d0de6c8ba93fd438f
+MISC ChangeLog 11032 SHA256 25baa9a9eac6922e76b50e0b801d63a0cf4d6e3d80ab2209503aa42011f071e9 SHA512 1f5f6bd3dbe5f6a6698939c8c9120ff971efafeba92267a8eefbfa1cd99deea9db8fe4a8d22929e98384802afc992aff3a256c7315f46113e742ec9865a77c9d WHIRLPOOL 0d140e715214817b32820731bf1cf721784c77bbe43c89bbbb72ed8d318ce0d2fa7850076561573c849529a480274924f97301c4df95e02a82cab4ae0aa21a55
 MISC metadata.xml 222 SHA256 b469c6bbb142dd5bab69af655d21fdddef8cec44c97750747e14649e0e5c2098 SHA512 6f61c65cfc7902e6439446cde64c83860a90d95be8494b8d16ae895ccc9eef0fd78c7fdbb0c17650967a1235d761245bb8cada1ab6aa19fa746f0ccf2ae68830 WHIRLPOOL 87cec6bffd811035d71e73d15fa753087731f704360ec53343c08e84682bab0a4f83546380cc1969abd93364ac7e1a2b5a448d531840a9f2dfbb5f987de5761e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJU0l0XXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
-QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9VyS0QALUJTF9eDDXLhyRPkEERzhEQ
-UcxelnjsIul3LAKj0kKbSUQSspZ4LxtdGroWoW/jEtxng123PKfb1b5g+05nPsqs
-xV1MdG7OPZzi9xKuFG0P6m2m/qrYR79K28GwnoMSaWTyQ6uTwxn8wv6q6d41kWiV
-Hfxe6maXRXRirnjcHfDFejusw1LwKseidoh7c0m8RVXDsRGIPC9bPOLITchpfIoN
-qMa5EMTC3rGuMUJWM7hJZKf2XGCqL8i9cVC6P4xa7Nq1DhhM0lkk/Epj7DEtNVyx
-WCRDQE733OmssWae973ooabnaChWDnohmuEWTP5eDDfSjJoa1ZgoG4Sgv47vQ2ao
-4PJMVRGbOHIspKFzmMIe33gpKvUSyYVd8tkabyuPHU00iJf9KmXJsSCN8VkCMR9O
-AiHFMaMS4uI7nWxUgdning/xMwEYN5Sae+Zm/9xYsv41Jq8iT9zOZH5ASpKPqO4S
-2vw5TuxbR3iYkfxbuQy2ZVp9lMEQUbKMAqUhLpOkKhs2kaIAiLvydp2/D8RCVvmf
-fIy7b6wQi40V1FGj6ksexefxN/35ufgGVyC3tKN7Ri05ihw3urSFtv+rR/CPcz4R
-PvlZEe6wMcjmASEXEhXj3FNqlPJOiOf5zvnvi8XeDwvFL/17UTRf6U8mz5/OaVkT
-3e7gADsgmmDLMPIFKOD2
-=gd5g
+iQIcBAEBCAAGBQJU9ywXAAoJEC7dUkA7aK9HOaQP/3Q01DmG/4zvEjAB6VtocnjQ
+wVftiUMiJeUq83JEAdMuDe9+w5EsAcM+tuBa1fETplCkEbGwuQLnrk8CQpz/xNqm
+eDAjVNQb1KXJT81jcAiZA7QZ2laPe+lcOZNr6TKmCn7wjbFh+1Ykynbq381LJKvK
+rOLQflC6R0rw6IXrFxGY0NC/TUwRmjUg8GI1fneIJzbbUhWqNmu651zoLGJ4g+Ab
+Ft543/SeDa7Mf7H7ZAoA0JqXTVmfav8Y5bKgQKcYIlQkDkJeiKpEBsB622MwsaYM
+vYjOmSRcqOVC2Wh62qSdaWwHTi69pljkrAIHJYkt9sPYv94e3gv8shUOlq9IuozB
+D0Wc/aiDBcXrKexvcBwhFvrK5b6SZlswpbyjNpodv/ZNMIbg9qaaoZGfxJkgsw2O
+xLeb0Z8quv66EVpfHdLTvubLhs6Sz0LypxMIKzKaolhgsIsnIYsg/kFljF616ge4
+2F3Ejcrl2xyabYXtplVnOvu5kN50e+KeYSYmzIW5hLJ+/hQVYlA79f3I+2dF37LW
+Wb9KLyFHq2SkYYJIbAI1IMLJYAH/pINg/3M1R0KpRUacvIifUqpCRzdOfuYs2ek+
+lFgyrrlrLweB+HQrGK36E/C7koLb4b8FkmCOgHQCyQTO8+EL4wbxNnBHVhd6/zlO
+wDNP2BfnucLL1kRJ1XS6
+=tXAo
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/checkpolicy/checkpolicy-2.4.ebuild b/sys-apps/checkpolicy/checkpolicy-2.4.ebuild
index 0986d76ca31a..a13d537044de 100644
--- a/sys-apps/checkpolicy/checkpolicy-2.4.ebuild
+++ b/sys-apps/checkpolicy/checkpolicy-2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/checkpolicy/checkpolicy-2.4.ebuild,v 1.1 2015/02/04 17:55:33 perfinion Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/checkpolicy/checkpolicy-2.4.ebuild,v 1.2 2015/03/04 16:00:26 swift Exp $
 
 EAPI="5"
 
@@ -34,7 +34,7 @@ src_prepare() {
 }
 
 src_compile() {
-	emake CC="$(tc-getCC)" YACC="bison -y"
+	emake CC="$(tc-getCC)" YACC="bison -y" LIBDIR="\$(PREFIX)/$(get_libdir)"
 }
 
 src_install() {