diff --git a/sys-devel/boost-m4/Manifest b/sys-devel/boost-m4/Manifest --- a/sys-devel/boost-m4/Manifest +++ b/sys-devel/boost-m4/Manifest @@ -1,23 +1,24 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 +AUX boost-m4-0.1-multilib.patch 1084 RMD160 9d2f912b70c433c60f0ff77afb9f77499f9eda01 SHA1 556b550b1e5b34795579a1abf2d045c6336ffa77 SHA256 b68d6a6cddca079e08f2b680c7d2bbf596dd42fcf8dbe655138206008ff0b286 DIST boost-m4-0.1.zip 41061 RMD160 b4f0a4f5035e1467f4d11e7b73c155fbe6b52d59 SHA1 b5745fdcd1e5fb1212ad611b0c9edb6f68eef292 SHA256 a1ef028bb39cc724791a2ab15fe133187fafeef132eb4e189251bc3cbc4b1461 -EBUILD boost-m4-0.1.ebuild 597 RMD160 7bd5000f42839a0c1b045843fd9f05c9a02270b5 SHA1 550d9421d38958d038d359e43e9b1d5457198815 SHA256 6cda522efe591270822e4c1e6aa3230f7f8aaca0c6ab859c6fab75c670328203 +EBUILD boost-m4-0.1.ebuild 674 RMD160 a0edc23f9382503def7d94f573f90b7ceb496685 SHA1 f0c4233b9c6080e8db267a49ad819b056220cf64 SHA256 89c2304973f0df66c63a4ba49ae412bbdc9cb8512dad79aa6bbba0065f8d15a6 MISC metadata.xml 229 RMD160 f0f6417bec31ce8baba6d476664f7210c8c84c98 SHA1 e5f94f5caadc6f843fc90bb7959570cd503676fd SHA256 3b08fca3c878bdfc4e7639f477dd542d55a4ab5dce39a475e82633071d13eb3f -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (GNU/Linux) -iQIcBAEBCAAGBQJNPSnxAAoJEHQ6UuhrqBBQXsAP/iMgL4tcx+lj5Nj22bVxnRpB -CYAulUthzmrc7sNOARckcqDJs/7SckuneqyYDhaZKCq8h4GZDSsdbWukWlUcxYv8 -DqskIWWEILTdEu1H8Pd2y3sr8B61Es2lYdxIiGY7eS877l2liYmpWEuxVC/AaLCn -W9ixoCtAugQ2d9RkrnAji6/mBtq+wHLtvJ27BdC6Tiuib1o5z3iEd7vkAKa+QQFc -PeHDlMGjFbUxNhv0oGc14RTW4jk7B48uZCn1OSDW7/wKzsfgMf5d+HLoWH4GXFnR -7+xkFNWYUESOwyvCUMCQhiqaBCBBlgxHWGeSojyX3f+/7WlTg7WSXkrzLt+gFBu/ -8BAnztYQA7KFEdZQQ86X7wOX4d5tXlVOCwLDBd+J4tEdP2LmKpkD1WBQ2VErFmro -lKhSfAWOmCGJfiQwbQZXrRk3JoEJjtIryOL0JQj1ZzJppBPVNOQmkLlOpSkHxMQl -pL09haUL8HUo6oaLOwi5Ps1ZocDS/9EmFw1nDVvSBuOYgJ2tWG99D/WKmTUmmQK9 -WqvYQkhb6O5d0Yo6hymL2YGLwRB797FXHyhwE53yVigZlcTgbxMilqoYdY9Lb5Rd -7fTjct7Q/HDerW6+pPaivPewXLHkclP4LFqAW1LYsBfXrs/G0kaA+PxRmmPm1h6k -AADuUobeQ9H0/pKQa4hP -=wXO1 +iQIcBAEBCAAGBQJNPStBAAoJEHQ6UuhrqBBQcGAP/RXVx5P9atcXVaLP7I3OWE5u +9leQR6F0dvrm8ICJoA6BErlMC5lswWjvthxoiC6dXqCRZFg9or4A6AFF0nF0NV/p +ZdzC3W61Y/146Jvv6zeyUFPIhYzjR39Ng4IU8IcGxIV8sgs0OkHG0KcWHTO/RSTb +CO5UBa5CQ70+7OPc+u/mhBpxdXfciMCJ0QMYrJWxQS4+m/OJg7/Y6M1MV+OFb576 +HJZn2zPBgH96RXzbub0XZO9iEOhT7HvqJ7iEaXKKXmV1tOUsyes5l2IM3Ga0HMzX +Pwy3VQ6Sp7RxAGpqJaECAEQ+/QGV4GqOLTF9yESAF9sNbFWDmlARH0Qq5KSWZXYp +KBRQO5Rn6dfLQ/9+in2uuql0nBMip9h4OAArbuVgLU/vsXf+2g/afTvQsdSdZS7j +N5CiVSAvxk4i4BdsWZsSYsCcwrW55PmRslnrdMD9pTytaq1v0kOcw2we85Rjr2gj +3xXO8sIVfnzl+D0zH50Fn7QrsqWiZv6E6aLhdkgHpsOnufWkIRw2287zmnpW/3h+ +vj6KyyGjtGxySWROJQZGLPB4HTcXfXY1YHT2mMuqwilLLi2OoanAUnmY6esmYOy2 +3sxpHeTLBL1LgLiQdcVkYmR3DIiso+sNtvzJxgFbZj9PHQbb0jZy+1xlF1zMINxJ +ZtunJNj0k4Y11WueEh2V +=EkhR -----END PGP SIGNATURE----- diff --git a/sys-devel/boost-m4/boost-m4-0.1.ebuild b/sys-devel/boost-m4/boost-m4-0.1.ebuild --- a/sys-devel/boost-m4/boost-m4-0.1.ebuild +++ b/sys-devel/boost-m4/boost-m4-0.1.ebuild @@ -4,6 +4,8 @@ EAPI=2 +inherit eutils + DESCRIPTION="Another set of autoconf macros for compiling against boost" HOMEPAGE="http://github.com/tsuna/boost.m4" SRC_URI="${HOMEPAGE}/zipball/v${PV} -> ${P}.zip" @@ -22,6 +24,10 @@ src_unpack() { mv * ${P} || die } +src_prepare() { + epatch "${FILESDIR}"/${P}-multilib.patch +} + src_configure() { :; } src_compile() { :; } diff --git a/sys-devel/boost-m4/files/boost-m4-0.1-multilib.patch b/sys-devel/boost-m4/files/boost-m4-0.1-multilib.patch new file mode 100644 --- /dev/null +++ b/sys-devel/boost-m4/files/boost-m4-0.1-multilib.patch @@ -0,0 +1,31 @@ +From a08684994caf88f28c758c7d579dae92fe69d0fa Mon Sep 17 00:00:00 2001 +From: Nathan Phillip Brink +Date: Mon, 24 Jan 2011 01:48:25 -0500 +Subject: [PATCH 2/2] Support multilib installations which use both lib32 and lib64. + +--- + build-aux/boost.m4 | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/build-aux/boost.m4 b/build-aux/boost.m4 +index 2ba29bf..3d271f6 100644 +--- a/build-aux/boost.m4 ++++ b/build-aux/boost.m4 +@@ -22,2 +22,2 @@ + +-# serial 6 ++# serial 6+15 +@@ -379,8 +379,8 @@ for boost_rtopt_ in $boost_rtopt '' -d; do + boost_tmp_lib=$with_boost + test x"$with_boost" = x && boost_tmp_lib=${boost_cv_inc_path%/include} + for boost_ldpath in "$boost_tmp_lib/lib" '' \ +- /opt/local/lib /usr/local/lib /opt/lib /usr/lib \ +- "$with_boost" C:/Boost/lib /lib /usr/lib64 /lib64 ++ /opt/local/lib* /usr/local/lib* /opt/lib* /usr/lib* \ ++ "$with_boost" C:/Boost/lib /lib* + do + test -e "$boost_ldpath" || continue + boost_save_LDFLAGS=$LDFLAGS +-- +1.7.2.2 +