diff options
author | Alexis Ballier <aballier@gentoo.org> | 2017-04-01 16:14:05 +0200 |
---|---|---|
committer | Alexis Ballier <aballier@gentoo.org> | 2017-04-02 10:37:43 +0200 |
commit | c7548f035d1b6381376f921001bd7ef44405ec35 (patch) | |
tree | efabb4f8173134081d09fe274f78234cf04510db /dev-lang | |
parent | dev-lang/ocaml: Strip -ggdb3 from cflags as it causes issues. (diff) | |
download | gentoo-c7548f035d1b6381376f921001bd7ef44405ec35.tar.gz gentoo-c7548f035d1b6381376f921001bd7ef44405ec35.tar.bz2 gentoo-c7548f035d1b6381376f921001bd7ef44405ec35.zip |
dev-lang/ocaml: remove shadowed version
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Diffstat (limited to 'dev-lang')
-rw-r--r-- | dev-lang/ocaml/Manifest | 1 | ||||
-rw-r--r-- | dev-lang/ocaml/ocaml-4.05.0_beta2.ebuild | 126 |
2 files changed, 0 insertions, 127 deletions
diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest index 568dd304e192..c65cf2ee741e 100644 --- a/dev-lang/ocaml/Manifest +++ b/dev-lang/ocaml/Manifest @@ -1,5 +1,4 @@ DIST ocaml-4.04.0.tar.gz 4057711 SHA256 03e49d09d5a509216ca0cc8fccd10df3ad9dd441d7633e89974a74e149be3c51 SHA512 288c514e7ccfe29fe9a65239d04f000b3b05df71f15bc05b3e5af50cb233544b4fec22baad69f60de587e8f0f8f65ee023a5b709896a1a68f9fd6fe30b81344d WHIRLPOOL 91fea4195ed84fb97f2ae68e30f47ce60a2404bc47ca809f6e0d182dd755833ea16a2e033ee0a02fab008f5905a2a9b6fa8dc2194c75b8d9daa353eb6b1d70e9 -DIST ocaml-4.05.0-beta2.tar.gz 4124413 SHA256 6bfe3d7ee29ff0a651b9c722294fc434b362de503128640769a1bc70181bc69a SHA512 14c63d58e34922d19a8efdd02d5fd8c508f9df99a9831509dd905b1451f313461355a66053de85cedb1394f5a7f60a03fe6fdc8b68e3f0013fd020902af38c56 WHIRLPOOL a7f372e796c4398fb09aea5e862a415b0ac9722f0d239fb2d52b08e6dfc160113aef621c9c79c8b875bf4fe301b9aec3e163d374eec423b1fec556a989aa7dd2 DIST ocaml-4.05.0-beta3.tar.gz 4424084 SHA256 3d82d5b32310d1c010981c12508e0ff63fb71b0c89457bcac813b7c291d4b61c SHA512 4c31f2b1f43d2c81ea9e8a6b86439806ab3b4b1ab6c6ae35bc98bbd2a993d94b9e26744febebe1d2424c5ee2deb8b5c9c45ff6fbf96bc629758dec86877fff80 WHIRLPOOL c2ecf0f8d4a9ee9fe92d1a0cbd3c16a4a341d6b8c1acd7077f8602aa730c88f7d58cf15f867da5f93c54de8c9f4984f5f12ae27ce3accedc0e4eeb0e0d73fc77 DIST ocaml-patches-8.tar.bz2 1803 SHA256 bce7ea483842f6e201cdf3de266928b39b5b45322315010291ed28f811720525 SHA512 fc477fbb5bdec60a3c4d3dfa110119bb579560ac0e0e57e30e076da72643bda6359c06fd3745fd3436c5d611dbbd888ec2921e9d1920f4929df633c35a797411 WHIRLPOOL ae73b5377744add3afce012b5745fafd70c0f92f75cd6cf91560e0f2ba359a91f7276afed13db145c307be9fdf79c339c2c69be6946565354c68d701fa61a4be DIST ocaml-patches-9.tar.bz2 1700 SHA256 1709c257536e9a8fdd25bfa651c4fb1aaff4c97596dbaa70eb4d4afc7020ae92 SHA512 cc19f9104fac69aecc5effa8cb772342e1fb61cdcd38ba0176efe04cf3d710b1c56d5178748f3bd29099af91fa684da432a8ef8d42de76dbd1b6954a255ea6c0 WHIRLPOOL 185406937ff0fdbfba3eed0e2e4267efac5aff1a15fc3cc5ea4434a57bf4a790bd21a801613d768328f3ab5046a0c85a0b73681c6711c348d0d0755a723c4857 diff --git a/dev-lang/ocaml/ocaml-4.05.0_beta2.ebuild b/dev-lang/ocaml/ocaml-4.05.0_beta2.ebuild deleted file mode 100644 index 5c4d7d76a7c8..000000000000 --- a/dev-lang/ocaml/ocaml-4.05.0_beta2.ebuild +++ /dev/null @@ -1,126 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit flag-o-matic eutils multilib versionator toolchain-funcs - -PATCHLEVEL="9" -MY_P="${P/_/-}" -DESCRIPTION="Type-inferring functional programming language descended from the ML family" -HOMEPAGE="http://www.ocaml.org/" -SRC_URI="https://github.com/ocaml/ocaml/archive/${PV/_/+}.tar.gz -> ${MY_P}.tar.gz - mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2" - -LICENSE="QPL-1.0 LGPL-2" -# Everytime ocaml is updated to a new version, everything ocaml must be rebuilt, -# so here we go with the subslot. -SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" -IUSE="emacs +flambda latex ncurses +ocamlopt spacetime X xemacs" - -RDEPEND=" - sys-libs/binutils-libs:= - ncurses? ( sys-libs/ncurses:0= ) - spacetime? ( sys-libs/libunwind:= ) - X? ( x11-libs/libX11 x11-proto/xproto )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -PDEPEND="emacs? ( app-emacs/ocaml-mode ) - xemacs? ( app-xemacs/ocaml )" - -S="${WORKDIR}/${MY_P}" -pkg_setup() { - # dev-lang/ocaml creates its own objects but calls gcc for linking, which will - # results in relocations if gcc wants to create a PIE executable - if gcc-specs-pie ; then - append-ldflags -nopie - ewarn "Ocaml generates its own native asm, you're using a PIE compiler" - ewarn "We have appended -nopie to ocaml build options" - ewarn "because linking an executable with pie while the objects are not pic will not work" - fi -} - -src_prepare() { - EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches" -} - -src_configure() { - export LC_ALL=C - local myconf="" - - # Causes build failures because it builds some programs with -pg, - # bug #270920 - filter-flags -fomit-frame-pointer - # Bug #285993 - filter-mfpmath sse - - # It doesn't compile on alpha without this LDFLAGS - use alpha && append-ldflags "-Wl,--no-relax" - - use ncurses || myconf="${myconf} -no-curses" - use X || myconf="${myconf} -no-graph" - use flambda && myconf="${myconf} -flambda" - use spacetime && myconf="${myconf} -spacetime" - - # ocaml uses a home-brewn configure script, preventing it to use econf. - RAW_LDFLAGS="$(raw-ldflags)" ./configure \ - --prefix "${EPREFIX}"/usr \ - --bindir "${EPREFIX}"/usr/bin \ - --target-bindir "${EPREFIX}"/usr/bin \ - --libdir "${EPREFIX}"/usr/$(get_libdir)/ocaml \ - --mandir "${EPREFIX}"/usr/share/man \ - -target "${CHOST}" \ - -host "${CBUILD}" \ - -cc "$(tc-getCC)" \ - -as "$(tc-getAS)" \ - -aspp "$(tc-getCC) -c" \ - -partialld "$(tc-getLD) -r" \ - --with-pthread ${myconf} || die "configure failed!" - - # http://caml.inria.fr/mantis/view.php?id=4698 - export CCLINKFLAGS="${LDFLAGS}" -} - -src_compile() { - emake world - - # Native code generation can be disabled now - if use ocamlopt ; then - # bug #279968 - emake opt - emake opt.opt - fi -} - -src_test() { - if use ocamlopt ; then - emake -j1 tests - else - ewarn "${PN} testsuite requires ocamlopt useflag" - fi -} - -src_install() { - emake BINDIR="${ED}"/usr/bin \ - LIBDIR="${ED}"/usr/$(get_libdir)/ocaml \ - MANDIR="${ED}"/usr/share/man \ - install - - # Symlink the headers to the right place - dodir /usr/include - dosym /usr/$(get_libdir)/ocaml/caml /usr/include/caml - - dodoc Changes README.adoc - - # Create and envd entry for latex input files - if use latex ; then - echo "TEXINPUTS=${EPREFIX}/usr/$(get_libdir)/ocaml/ocamldoc:" > "${T}"/99ocamldoc - doenvd "${T}"/99ocamldoc - fi - - # Install ocaml-rebuild portage set - insinto /usr/share/portage/config/sets - doins "${FILESDIR}/ocaml.conf" -} |