From: Christian Heim Date: Sun, 22 Apr 2007 20:00:56 +0000 (+0000) Subject: Restricting FEATURES=test for now, make bootstrap deletes the *.opt files (thanks... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=68f66d3f679a4ce4a734eb52fb84e6b1ff31fe41;p=gentoo.git Restricting FEATURES=test for now, make bootstrap deletes the *.opt files (thanks Matti); Removing the QA_TEXTREL definition, which is only intended for binary packages; Provide a way to compile ocaml on AMD64/hardened. Package-Manager: portage-2.1.2.4 --- diff --git a/dev-lang/ocaml/ChangeLog b/dev-lang/ocaml/ChangeLog index 8d1266cd9ede..8d92cd351df9 100644 --- a/dev-lang/ocaml/ChangeLog +++ b/dev-lang/ocaml/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-lang/ocaml # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.98 2007/04/22 13:55:57 phreak Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.99 2007/04/22 20:00:56 phreak Exp $ + + 22 Apr 2007; Christian Heim ocaml-3.09.3-r1.ebuild: + Restricting FEATURES=test for now, make bootstrap deletes the *.opt files + (thanks Matti); Removing the QA_TEXTREL definition, which is only intended + for binary packages; Provide a way to compile ocaml on AMD64/hardened. *ocaml-3.09.3-r1 (22 Apr 2007) diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest index 302695fca7e6..0b3d949c9065 100644 --- a/dev-lang/ocaml/Manifest +++ b/dev-lang/ocaml/Manifest @@ -41,18 +41,18 @@ EBUILD ocaml-3.09.2.ebuild 2414 RMD160 575a8b85655e7a6099eadfc3e8434866b7b9fbf4 MD5 ad4b43bea4ee37b5d152f02e44da38f5 ocaml-3.09.2.ebuild 2414 RMD160 575a8b85655e7a6099eadfc3e8434866b7b9fbf4 ocaml-3.09.2.ebuild 2414 SHA256 7f1202a717cdce1a89f05ca049d5a2469fd212c13fcf0f03881cedd0f75a1b63 ocaml-3.09.2.ebuild 2414 -EBUILD ocaml-3.09.3-r1.ebuild 4041 RMD160 b451971fc490bd314b9cccbc9e0cee40b4b16dd2 SHA1 a10f3787dc3747bada40f089e786047a0661bb94 SHA256 697fcab0f20d803c722fde19351e247c26f1e8c85af8b1e7dfdbb04e58c891c2 -MD5 e3f9e9eaa3ba0012e54f43a46d644cb2 ocaml-3.09.3-r1.ebuild 4041 -RMD160 b451971fc490bd314b9cccbc9e0cee40b4b16dd2 ocaml-3.09.3-r1.ebuild 4041 -SHA256 697fcab0f20d803c722fde19351e247c26f1e8c85af8b1e7dfdbb04e58c891c2 ocaml-3.09.3-r1.ebuild 4041 +EBUILD ocaml-3.09.3-r1.ebuild 4606 RMD160 1cad2dc36a1f36bb4f31cbd623c49852fa5a1a1e SHA1 e9b1eb12e471e7cdb6deb0ffbd15a2277bfaa13c SHA256 f71bf2bd732e3bd25950867147a3a7723c1c5ed403c12ed14d3ce84cb1f6ccc2 +MD5 5126d38106fe2a0b2899ecfca9fdf6b5 ocaml-3.09.3-r1.ebuild 4606 +RMD160 1cad2dc36a1f36bb4f31cbd623c49852fa5a1a1e ocaml-3.09.3-r1.ebuild 4606 +SHA256 f71bf2bd732e3bd25950867147a3a7723c1c5ed403c12ed14d3ce84cb1f6ccc2 ocaml-3.09.3-r1.ebuild 4606 EBUILD ocaml-3.09.3.ebuild 2546 RMD160 3633ad343af82d4ccd960520be42a6818f65e1eb SHA1 0e31867ac7a27d946a7e64c6ecc5f711d396aaa2 SHA256 d9ebc69c806a36354d9cc53132095ccce0d1001cc38b22dbbb20ac625e9b9aff MD5 34cae488a62c65feb4a5a7a2ecec483a ocaml-3.09.3.ebuild 2546 RMD160 3633ad343af82d4ccd960520be42a6818f65e1eb ocaml-3.09.3.ebuild 2546 SHA256 d9ebc69c806a36354d9cc53132095ccce0d1001cc38b22dbbb20ac625e9b9aff ocaml-3.09.3.ebuild 2546 -MISC ChangeLog 15051 RMD160 1bd1147f0a294342edb42669ce37e013b3cd9222 SHA1 6b506a0bdbd9221b9234cb2728d15ab1d5fcccad SHA256 e5cede5389202ae3113c86cfe28bdcb9e5d0d333d1060deaf3a29487cb9bf05c -MD5 442e0dd49b1b8e0442825338fca5e1ee ChangeLog 15051 -RMD160 1bd1147f0a294342edb42669ce37e013b3cd9222 ChangeLog 15051 -SHA256 e5cede5389202ae3113c86cfe28bdcb9e5d0d333d1060deaf3a29487cb9bf05c ChangeLog 15051 +MISC ChangeLog 15352 RMD160 a2fd53c1bcbf519154ee5d2fa4df117375261733 SHA1 830e01626184d511e22a91c6690c9c7f9ce981a0 SHA256 dd368667418084f8c319dabf0724c37272b0c09002129e635b9e57188a36bd5d +MD5 cd9e3e24be23f0af2ae7d72156839498 ChangeLog 15352 +RMD160 a2fd53c1bcbf519154ee5d2fa4df117375261733 ChangeLog 15352 +SHA256 dd368667418084f8c319dabf0724c37272b0c09002129e635b9e57188a36bd5d ChangeLog 15352 MISC metadata.xml 155 RMD160 dfaa057e679b01302a807c75a32a910098b26809 SHA1 94024f83dcacbb53e92be090dd0f994ec93dc90d SHA256 118048376ebb76f57628b0819f3de4856e73959c2578c88715d37ea2d1e0af81 MD5 8b350f19c06fcabf1053b0421b7c3f5a metadata.xml 155 RMD160 dfaa057e679b01302a807c75a32a910098b26809 metadata.xml 155 @@ -75,7 +75,7 @@ SHA256 19708f759185ed39623e03921462ba20fb6f3533268673d2bcd7dd07cef57350 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.3 (GNU/Linux) -iD8DBQFGK2l4yuNVb5qfaOYRAgWKAJ9ngMlFOxc7CICA1r4zQggwwrZXiwCfeHm5 -K5JHdqWTpIStcWLd1LcyPX4= -=3/Ex +iD8DBQFGK78DyuNVb5qfaOYRAuu1AJsENfbH9M9gfS7w3fogczQDtBj9tACeLkaU +NLLmK/3NOii9crPE4gatzO0= +=PYSt -----END PGP SIGNATURE----- diff --git a/dev-lang/ocaml/ocaml-3.09.3-r1.ebuild b/dev-lang/ocaml/ocaml-3.09.3-r1.ebuild index 79afa3249427..840e521c822d 100644 --- a/dev-lang/ocaml/ocaml-3.09.3-r1.ebuild +++ b/dev-lang/ocaml/ocaml-3.09.3-r1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.09.3-r1.ebuild,v 1.1 2007/04/22 13:55:57 phreak Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.09.3-r1.ebuild,v 1.2 2007/04/22 20:00:56 phreak Exp $ -inherit flag-o-matic eutils multilib pax-utils versionator +inherit flag-o-matic eutils multilib pax-utils versionator toolchain-funcs DESCRIPTION="fast modern type-inferring functional programming language descended from the ML (Meta Language) family" HOMEPAGE="http://www.ocaml.org/" @@ -16,10 +16,20 @@ IUSE="tk latex" DEPEND="virtual/libc tk? ( >=dev-lang/tk-3.3.3 )" +# ocaml deletes the *.opt files when running bootstrap +RESTRICT="test" + QA_EXECSTACK="/usr/lib/ocaml/compiler-*" -# This is a crappy way to deal with the textrels, but it keeps stuff simple -QA_TEXTRELS="usr/bin/ocaml*.opt usr/bin/camlp4*.opt" +pkg_setup() { + # dev-lang/ocaml fails with -fPIC errors due to a "relocation R_X86_64_32S" on AMD64/hardened + if use amd64 && gcc-specs-pie ; then + echo + eerror "${CATEGORY}/${PF} is currently broken on this platform with specfiles injecting -PIE." + eerror "Please switch to your \"${CHOST}-$(gcc-fullversion)-hardenednopie\" specfile via gcc-config!" + die "Current specfile (${CHOST}-$(gcc-fullversion)) not supported by ${PF}!" + fi +} src_unpack() { unpack ${A} @@ -72,9 +82,9 @@ src_compile() { fi } -src_test() { - make bootstrap -} +#src_test() { +# make bootstrap +#} src_install() { make BINDIR="${D}"/usr/bin \ @@ -99,7 +109,7 @@ src_install() { # Turn MPROTECT off for some of the ocaml binaries, since they are trying to # rewrite the segment (which will obviously fail on systems having # PAX_MPROTECT enabled). - pax-mark -m "${D}"//usr/bin/ocamldoc.opt "${D}"/usr/bin/ocamldep.opt \ + pax-mark -m "${D}"/usr/bin/ocamldoc.opt "${D}"/usr/bin/ocamldep.opt \ "${D}"/usr/bin/ocamllex.opt "${D}"/usr/bin/camlp4r.opt \ "${D}"/usr/bin/camlp4o.opt @@ -112,6 +122,12 @@ src_install() { } pkg_postinst() { + if use amd64 && gcc-specs-ssp ; then + ewarn + ewarn "Make sure, you switch back to the default specfile ${CHOST}-$(gcc-fullversion) via gcc-config!" + ewarn + fi + echo elog "OCaml is not binary compatible from version to version, so you (may)" elog "need to rebuild all packages depending on it, that are actually"