diff options
6 files changed, 76 insertions, 13 deletions
diff --git a/dev-util/boost-build/ChangeLog b/dev-util/boost-build/ChangeLog index 6e2b2f09a043..9e3bff50e099 100644 --- a/dev-util/boost-build/ChangeLog +++ b/dev-util/boost-build/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-util/boost-build # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/ChangeLog,v 1.110 2012/12/06 22:32:59 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/ChangeLog,v 1.111 2012/12/08 12:11:22 grobian Exp $ + + 08 Dec 2012; Fabian Groffen <grobian@gentoo.org> + +files/boost-build-1.49.0-darwin-gentoo-toolchain.patch, + +files/boost-build-1.52.0-darwin-no-python-framework.patch, + boost-build-1.52.0-r1.ebuild, + files/boost-build-1.50.0-respect-c_ld-flags.patch: + Finish Prefix support, add Patches for Darwin and Solaris, add Prefix keywords 06 Dec 2012; Sébastien Fabbro <bicatali@gentoo.org> boost-build-1.52.0-r1.ebuild: diff --git a/dev-util/boost-build/Manifest b/dev-util/boost-build/Manifest index a2e81b322c86..3bca434f9fef 100644 --- a/dev-util/boost-build/Manifest +++ b/dev-util/boost-build/Manifest @@ -4,8 +4,10 @@ Hash: SHA256 AUX boost-build-1.42-env-whitespace.patch 683 SHA256 52714f45a54cad8c126d5fca8bd5eacc4d746b29df24aaa9d2c55e3694a6f4aa SHA512 91adaafcfa3aabc570300c97341297bffb0edbba7e8cf2079e75ceca41f306c3e44f54eef1e02ca9efadb6a8d561ec427111f8bcf27ea2e19159bf6f95999672 WHIRLPOOL e413c2ff39725fdb8e3ef2d57828ad3f0d1e49b269411cb47d82a90881f1a2ca6ded9ba202d20e64e71d9a17cada942b6ff3a9d2f906eebe79283fa978555075 AUX boost-build-1.48.0-disable_python_rpath.patch 337 SHA256 979727bd1aabf6df05d8b06e3ac525bb6d44c2b18c3e4e1331528c4633b7e9df SHA512 4244814e05c15478992a775b9f63fc0b7477caa4770af7f61f0e664af7e681c33c3a5be3b6842e1d4e159af43adde820d00cc0f92c990cea59899ec0aa2d273c WHIRLPOOL 3d395f0adb341430192f2bc3507d8f585ea2afe7cedcbfd95e5b6fce53fd6cf34b5a612d36937cf3413f38e20f9b2bb72938f1b1fb07895f63297d5e4c4c2a6e AUX boost-build-1.48.0-support_dots_in_python-buildid.patch 627 SHA256 e544b0c81a09ad3e56800bef4e7a3e78b5b27ee7377e7f4fc66d1aecd955ae0a SHA512 3f7be047fab021890870797b349122a6e71f51f4187ce430e9f325c7c25981bf5378fe41c32e8f3be87fec8e91ba9640cc87ccf75fd27cf9aa505e1a607afd71 WHIRLPOOL b7dab03a0d89e0131009dccfcf9945acfa35b222c07a7db4f880aef80140c9ff13d18f570763502a1e8bdc066b13b7320b82c3d9e8cfd0848c1b0aff7b168a43 +AUX boost-build-1.49.0-darwin-gentoo-toolchain.patch 647 SHA256 f729f8e7cd9046cbb653e2f687a8e72e71a313cffb14805e8783e7799786441b SHA512 53a4f0b53a53d65c9777d2621b957a5b2620899f631017858bad975b82be3ac3c0acbef9d694c3b86fe41b0aba5c170e4e0b63b169c5d00a6d4448fa506b66a4 WHIRLPOOL e2c83f06667938c6f2b32aefa2f5a7ad07a68c1366c55eef7b9bda9c42b31f417c34127f518cca151245c82704e45fe6a5402e3b26383f79de417c728e67e667 AUX boost-build-1.50.0-fix-test.patch 428 SHA256 649d36035315caad20807a6b6931155c94c04cd3a0d4ff0e4987e247798d39b6 SHA512 8ceb373209eef19a7bce932b004eb4ec3655110840f5af10198883f25657ef048cf6ab6b6e962ab4ceeb2327af117b8c8b788f23c84549324f36adf5f0dfd4cf WHIRLPOOL be8c7567c61cfeafd36df92356a59738a421b1db95a62f1694e23a9a5d803060b9bb734fe78ef12252aa98e7c47d5527d720b89f62ada9b1d8352cba98d242f7 -AUX boost-build-1.50.0-respect-c_ld-flags.patch 1740 SHA256 2a1e98ffc557249ad04f58587bcb3b08f8c38bcfdb2c9989035ec74e85c8c0db SHA512 d54eb57cb7d4ed57abd6425416c250313b9e377394d63497b0a59522e427c1eccb1255d955f69f7624a22dd97f9039b9d977791bc35abd005296c3fc31931360 WHIRLPOOL 87f28c7f22e2ad4f5dda48d8c7de1305a3e6787d26fb29fd3ae8c02f29dd6087f2037f6c6305b5229b5f15e5e4e9cf2db7b4665e519fb8808cdcfc902063cc61 +AUX boost-build-1.50.0-respect-c_ld-flags.patch 2014 SHA256 15db5440bee28ff3109f0a9a45a4426026b1ded36da88fa8f8a828bff961cd74 SHA512 cd9454009a09795f9b6ad7da187046e43ad624cb56ac79d53596771b69793666247bac540e580060a20694ea7c42f0bb13b266b98cee43a04397bc8931016508 WHIRLPOOL 9267db366be1dff9ead6b846c88a78312600fd2b3a0b9864fa3c7c767a3bd41a4b10b2508f44eb39bb0748163bacda4423eafe2872b2b6482bdcc269c25a1bdd +AUX boost-build-1.52.0-darwin-no-python-framework.patch 415 SHA256 1a85311e133f3cdb3d17bfd10fe64c244c2efa23722def1334f89dad9274dace SHA512 68a43d610f5d92f5733b9fbf08348e06e190ec7e30f8d5e63ff95c3123539bc582b4d4fe960de586c0df243c5c49e36e9bccf49ca2017884aaa6a2a2b5759d56 WHIRLPOOL 82458d31670568b583f5c067c3224560d50c97f830e67138c31054371267012a29f9a1e902f885c576b2b39af4d92a387028183223d626a3e45a8cfbc9ef366d AUX site-config.jam 688 SHA256 795b0719536a934a1c65cfd4abf09ad4f30ad7d90ad4d55b00c858ee35e8890f SHA512 b65bf1be3133f9f66d3139b00f195a288591bb20a13ba35041507c2c33d7d2da6047c3b02dc27bc4eb21798b91e1262a60e294b7fd4af90808b9de0f5af517df WHIRLPOOL be4e6a1a308dc41e522be919d765b85cb67909ed74d022ca4bf8264ec86ade1caffe8d69a630b21d4abfed1d0c1e8ef079f874046a713fcdf4f0d72f3f0b6386 DIST boost_1_46_1.tar.bz2 42001335 SHA256 e1dfbf42b16e5015c46b98e9899c423ca4d04469cbeee05e43ea19236416d883 SHA512 e7cc4383bb960cb59eecd29ef66e2c53466fe5f126bde58f50ba104ee8ab220771db5f7b35e4b9856e9f257d1def5a9b7ea48e1d2757976a89c5a2e3f1fdc327 WHIRLPOOL 4d8d94821c996475ec2bab962b92ec061b890a318897cab695e66daef3f9c8687990450fb26fd783fd0c5be35ccb71616994ef0c8e41c555312ae5383e3649cf DIST boost_1_49_0.tar.bz2 48499961 SHA256 dd748a7f5507a7e7af74f452e1c52a64e651ed1f7263fce438a06641d2180d3c SHA512 9f6198270659df112a57731afe31cbf1012d103ba36ed82f6c3f1bdc0185ddb89dcc42c5dfb9ee3f95973d52999aad6c7509dc61125420d45146e39ebf20219d WHIRLPOOL c049b4212307b0208d0b37ac870a7cfb8562d2b685ce505e1971af7bc68ae9746b06ea80ddc52599ed4cbd6dc3305b5f8051cd771387412aaa1d2f8e939a48ba @@ -14,13 +16,13 @@ DIST boost_1_52_0.tar.bz2 54421709 SHA256 222b6afd7723f396f5682c20130314a10196d3 EBUILD boost-build-1.46.1.ebuild 3275 SHA256 75a659bc6f3c58d00596fbc8e5507a3e54c99e6b6093c45ef2c20e4877382f8a SHA512 c1885d403dae63dff6338988b9843eb24e755613b7c920bd5247779fcbda4c63848737dd79e2eaf964320c29d84ce0dd72bb52e032b77775857d4883cdc3a5d0 WHIRLPOOL 9145e6ed21de86cb93cf064e3a3cc363bb978eebc4c2365b280ea74ea655dcc74a87098089e26553d04dc346e1fcd8a4c9e0e0a1170292055e17a3fe8d3da917 EBUILD boost-build-1.49.0.ebuild 3409 SHA256 255344ee046ebdb39073ec68058629fc1c13f6b396f7e8b38b7d56f10de5cd21 SHA512 8b0cad7b8af43843d0a004494cdfb396cfafe26fd78095fcc8dabccb89cca0250868c7f1e76955fab1829869eae5741739cf848128c304c57251ba35d4dd1ac3 WHIRLPOOL df250e18c580f16decae85b73d6121a2e28042b34eebfd6b8589fdb568ce55a3a62b3c23a1ffaca83b2f1a5576128678f476449087a46216504f6c025273f3e9 EBUILD boost-build-1.51.0.ebuild 3869 SHA256 64d0e2710615e1c6721e00f667b6b06a4a12978a8ac23e43a6ca34e20225d833 SHA512 4daaf709b8e0dcbaaca4cf8cc4d5e35d245f2a070055ab2a32bba34129695ed375ec6ace9d28ae6cd70a8e9c7456b6df0e9fcfec65a5fc5a14e08d10faf4308a WHIRLPOOL 805b892ff901208381f1d593526feed36a0d224f2bfa67e43a09e70370a5ef945fc7c038f44c6652e2bbb0dfe8178d7fb2dfe3589b5d170c8b50ef4278e7b1da -EBUILD boost-build-1.52.0-r1.ebuild 3575 SHA256 43609d5269545dea4d988d26a68a06994e8718915a09bc92f5868f3df3286e70 SHA512 87239fb23b0a0af6f62106b6ce5c3371500825c3e1380c955ea16c2e0ded8857c25aa09640a490fc889ee4ffbfec70e5c3ba393bbd8de4006e530cc4604b7f2e WHIRLPOOL 1d948a56943f8f9077ae6bd8faa46f1965ce775817de950262b5e323e4c35f3fb86a9f679b4a23ff7cc564331d637687f882148e77db130106e31602d4e6ff6c -MISC ChangeLog 16085 SHA256 9d2c130bb610dc315a04ac930b90a663d2fcf289d8299a4a8f776a22c4c4fe50 SHA512 e6584ccc7d4b09bf48f68d163f790a759b46f97c2af19043597c78e99ad9039e838083870a19a655e5f26c83c66e1cb16fc1a63cbaeaa839683834f04368b32b WHIRLPOOL db7ea5c1de8bba55e35a80f29ce4d1240337b8386f96d86b5e8840c9aa374efad52580b3ccf8f11e944f5eebd3a1c2169926032920498357e2df6805b64f903b +EBUILD boost-build-1.52.0-r1.ebuild 3825 SHA256 d0bd16d8b27d90834c9bab9727b82b39b3089723c864ed98599c100cea600f16 SHA512 9bc3667d9428006eb9f0f3df29b3bd2110f55aa3a48a8532f69f026c249a55e953e922b65b1da58c950e53307def9b34a10bf3951e2d3d5f6981dd78c672ad46 WHIRLPOOL 85b3d6fe9c4fee354334f2e06f0d2787a1a5b91baac23473460b73ea1a61471ea5c651158058559f8db5b1589c79f7e211577e64eb001031e993a32cb58a9725 +MISC ChangeLog 16423 SHA256 e5506605e3f448df34eb9da2f94b9e2ee811064e97ff9cb0dd40cd6f773dd472 SHA512 53435c94eb510b196785bea7d604db24b201571db8d50f8ecf9a2e5991e5f767e8b17e81cadc97bd27aa3bf46d7891e7d9e82ff14696fe2a002604b6ecc9a49a WHIRLPOOL f6604156c945bec03dff72f13711c07222c0d5b72c47c320c610a6ebe420bfc84c5fb7b11e3f887818b6d019ca11ff4f76ff4c58bff9b019e3c7fab5ac194dce MISC metadata.xml 158 SHA256 b52dff4a9d9f4eab0428972c9ee5a96df08f39325e4b491c39493da499fedf51 SHA512 5300260c2c2bad38b7a27b5c1d609b48b105034c63807958425e8f8fbcccc02a408bb5565480bb3ee3c87d368ed16859c48b447241adf15896e7508c6c442e65 WHIRLPOOL 17880f728fdb3dbd6ca582547c3c546ffe798d89d37ac717bc0be4e4764b60b867979c996ca89f4fdeedee021c419b964405b5fb674a220e582a436f653b8f30 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) +Version: GnuPG v2.0.19 (Darwin) -iEYEAREIAAYFAlDBHTEACgkQ1ycZbhPLE2BXxACeOkjpEY7V3ez5wt9KbTDhRaEp -iHcAn2PLGpW0g/CwLr2jvxKF8CkGz/Vz -=tua7 +iEYEAREIAAYFAlDDLm0ACgkQX3X2B8XHTolcGACgouJUFfHEeY2pY3SXMPkg1Y6d +//sAn1hmtM4T9GbWUnaXoi2yHKGjVunW +=5dBw -----END PGP SIGNATURE----- diff --git a/dev-util/boost-build/boost-build-1.52.0-r1.ebuild b/dev-util/boost-build/boost-build-1.52.0-r1.ebuild index d4c898e99921..2738e445ab85 100644 --- a/dev-util/boost-build/boost-build-1.52.0-r1.ebuild +++ b/dev-util/boost-build/boost-build-1.52.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/boost-build-1.52.0-r1.ebuild,v 1.2 2012/12/06 22:32:59 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/boost-build-1.52.0-r1.ebuild,v 1.3 2012/12/08 12:11:22 grobian Exp $ EAPI="5" PYTHON_DEPEND="python? 2" @@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/boost/boost_${MY_PV}.tar.bz2" LICENSE="Boost-1.0" SLOT=0 -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-fbsd ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-aix ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="examples python test" REQUIRED_USE="test? ( python )" @@ -43,7 +43,9 @@ src_prepare() { "${FILESDIR}/${PN}-1.48.0-support_dots_in_python-buildid.patch" \ "${FILESDIR}/${PN}-1.48.0-disable_python_rpath.patch" \ "${FILESDIR}/${PN}-1.50.0-respect-c_ld-flags.patch" \ - "${FILESDIR}/${PN}-1.50.0-fix-test.patch" + "${FILESDIR}/${PN}-1.50.0-fix-test.patch" \ + "${FILESDIR}/${PN}-1.49.0-darwin-gentoo-toolchain.patch" \ + "${FILESDIR}/${PN}-1.52.0-darwin-no-python-framework.patch" # Remove stripping option cd "${S}/engine" @@ -97,9 +99,9 @@ src_install() { boost-build.jam bootstrap.jam build-system.jam user-config.jam *.py \ build kernel options tools util - rm "${D}/usr/share/boost-build/build/project.ann.py" || die "removing faulty python file failed" + rm "${ED}/usr/share/boost-build/build/project.ann.py" || die "removing faulty python file failed" if ! use python; then - find "${D}/usr/share/boost-build" -iname "*.py" -delete || die "removing experimental python files failed" + find "${ED}/usr/share/boost-build" -iname "*.py" -delete || die "removing experimental python files failed" fi dodoc changes.txt hacking.txt release_procedure.txt \ diff --git a/dev-util/boost-build/files/boost-build-1.49.0-darwin-gentoo-toolchain.patch b/dev-util/boost-build/files/boost-build-1.49.0-darwin-gentoo-toolchain.patch new file mode 100644 index 000000000000..f5d6188f1954 --- /dev/null +++ b/dev-util/boost-build/files/boost-build-1.49.0-darwin-gentoo-toolchain.patch @@ -0,0 +1,26 @@ +Avoid adding all kinds of things to the toolchain's flags that within +Gentoo (Prefix) we really shouldn't, such as sysroot, deployment target, +arch, etc. + +--- tools/darwin.jam ++++ tools/darwin.jam +@@ -227,6 +227,9 @@ + } + } + ++ # leave compiler flags etc. up to the toolchain ++ return $(version-feature) ; ++ + if $(version-feature) + { + if $(.debug-configuration) +@@ -387,7 +390,8 @@ + support-ppc64 = ; + } + } +- switch $(arch) ++ # Gentoo Prefix toolchain doesn't do multi-arch, so don't try either ++ switch $(donotaddarchpleaseXXXarch) + { + case combined : + { diff --git a/dev-util/boost-build/files/boost-build-1.50.0-respect-c_ld-flags.patch b/dev-util/boost-build/files/boost-build-1.50.0-respect-c_ld-flags.patch index 6c60777f71ba..f0a1561d718f 100644 --- a/dev-util/boost-build/files/boost-build-1.50.0-respect-c_ld-flags.patch +++ b/dev-util/boost-build/files/boost-build-1.50.0-respect-c_ld-flags.patch @@ -1,5 +1,14 @@ --- engine/build.jam.orig 2012-08-19 09:47:23.916383518 +0200 +++ engine/build.jam 2012-08-19 09:53:38.011554690 +0200 +@@ -3,7 +3,7 @@ + #~ (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) + + # Clean env vars of any "extra" empty values. +-for local v in ARGV CC CFLAGS LIBS ++for local v in ARGV CC CFLAGS LDFLAGS LIBS + { + local values ; + for local x in $($(v)) @@ -179,10 +179,10 @@ if ! $(CC) { CC = cc ; } toolset cc $(CC) : "-o " : -D diff --git a/dev-util/boost-build/files/boost-build-1.52.0-darwin-no-python-framework.patch b/dev-util/boost-build/files/boost-build-1.52.0-darwin-no-python-framework.patch new file mode 100644 index 000000000000..08b40f31455a --- /dev/null +++ b/dev-util/boost-build/files/boost-build-1.52.0-darwin-no-python-framework.patch @@ -0,0 +1,17 @@ +Don't look for the framework path, we build Python the UNIX way for +Gentoo Prefix + +--- engine/build.jam ++++ engine/build.jam +@@ -82,11 +82,6 @@ + } + --python-lib = $(--python-lib[1]) ; + } +- else if $(OS) = MACOSX +- { +- --python-include = [ .path $(python-location) Headers ] ; +- --python-lib = $(python-location) Python ; +- } + else + { + --python-include = ; |