From dd0745f1854a65cbcdb29f941004d4cf41cd3630 Mon Sep 17 00:00:00 2001 From: Danilo Spinella Date: Mon, 6 Aug 2018 17:32:51 +0200 Subject: [PATCH] ocaml: Bump to version 4.07.0 Unmask package. --- metadata/repository_mask.conf | 7 -- .../files/Fix-build-prefixed-tools.patch | 68 ------------------- .../dev-lang/ocaml/ocaml-4.02.1-r2.exheres-0 | 10 --- ....03.0.exheres-0 => ocaml-4.07.0.exheres-0} | 2 +- packages/dev-lang/ocaml/ocaml.exlib | 16 +---- 5 files changed, 3 insertions(+), 100 deletions(-) delete mode 100644 packages/dev-lang/ocaml/files/Fix-build-prefixed-tools.patch delete mode 100644 packages/dev-lang/ocaml/ocaml-4.02.1-r2.exheres-0 rename packages/dev-lang/ocaml/{ocaml-4.03.0.exheres-0 => ocaml-4.07.0.exheres-0} (60%) diff --git a/metadata/repository_mask.conf b/metadata/repository_mask.conf index f8b3c2d..26139ae 100644 --- a/metadata/repository_mask.conf +++ b/metadata/repository_mask.conf @@ -1,10 +1,3 @@ -dev-lang/ocaml [[ - author = [ Nikolay Orliuk ] - date = [ 3 May 2015 ] - token = broken - description = [ Incomplete migration to multiarch (TODO cross targets) ] -]] - dev-lang/coq[=scm] [[ author = [ Alex Elsayed ] date = [ 10 October 2016 ] diff --git a/packages/dev-lang/ocaml/files/Fix-build-prefixed-tools.patch b/packages/dev-lang/ocaml/files/Fix-build-prefixed-tools.patch deleted file mode 100644 index f21503a..0000000 --- a/packages/dev-lang/ocaml/files/Fix-build-prefixed-tools.patch +++ /dev/null @@ -1,68 +0,0 @@ -Source: Niels Ole Salscheider -Upstream: See http://caml.inria.fr/mantis/view.php?id=6846 -Reason: Fixes the build with multiarch - -Index: asmrun/Makefile -=================================================================== ---- a/asmrun/Makefile (Revision 16031) -+++ b/asmrun/Makefile (Arbeitskopie) -@@ -37,7 +37,7 @@ - - libasmrun.a: $(OBJS) - rm -f libasmrun.a -- ar rc libasmrun.a $(OBJS) -+ $(ARCMD) rc libasmrun.a $(OBJS) - $(RANLIB) libasmrun.a - - all-noruntimed: -@@ -48,7 +48,7 @@ - - libasmrund.a: $(DOBJS) - rm -f libasmrund.a -- ar rc libasmrund.a $(DOBJS) -+ $(ARCMD) rc libasmrund.a $(DOBJS) - $(RANLIB) libasmrund.a - - all-noprof: -@@ -57,7 +57,7 @@ - - libasmrunp.a: $(POBJS) - rm -f libasmrunp.a -- ar rc libasmrunp.a $(POBJS) -+ $(ARCMD) rc libasmrunp.a $(POBJS) - $(RANLIB) libasmrunp.a - - INSTALL_LIBDIR=$(DESTDIR)$(LIBDIR) -Index: byterun/Makefile -=================================================================== ---- a/byterun/Makefile (Revision 16031) -+++ b/byterun/Makefile (Arbeitskopie) -@@ -34,11 +34,11 @@ - prims.o libcamlrund.a $(BYTECCLIBS) - - libcamlrun.a: $(OBJS) -- ar rc libcamlrun.a $(OBJS) -+ $(ARCMD) rc libcamlrun.a $(OBJS) - $(RANLIB) libcamlrun.a - - libcamlrund.a: $(DOBJS) -- ar rc libcamlrund.a $(DOBJS) -+ $(ARCMD) rc libcamlrund.a $(DOBJS) - $(RANLIB) libcamlrund.a - - libcamlrun_shared.so: $(PICOBJS) -Index: configure -=================================================================== ---- a/configure (Revision 16031) -+++ b/configure (Arbeitskopie) -@@ -1675,8 +1676,8 @@ - #ml let syslib x = "-l"^x;; - - ### How to build a static library --MKLIB=ar rc \$(1) \$(2); ranlib \$(1) --#ml let mklib out files opts = Printf.sprintf "ar rc %s %s %s; ranlib %s" out opts files out;; -+MKLIB=${TOOLPREF}ar rc \$(1) \$(2); ${TOOLPREF}ranlib \$(1) -+#ml let mklib out files opts = Printf.sprintf "${TOOLPREF}ar rc %s %s %s; ${TOOLPREF}ranlib %s" out opts files out;; - EOF - echo "ARCH=$arch" >> Makefile - echo "MODEL=$model" >> Makefile diff --git a/packages/dev-lang/ocaml/ocaml-4.02.1-r2.exheres-0 b/packages/dev-lang/ocaml/ocaml-4.02.1-r2.exheres-0 deleted file mode 100644 index c6b1ce6..0000000 --- a/packages/dev-lang/ocaml/ocaml-4.02.1-r2.exheres-0 +++ /dev/null @@ -1,10 +0,0 @@ -# Distributed under the terms of the GNU General Public License v2 -# Copyright 2013 Nicolas Braud-Santoni - -require ocaml - -SLOT="0" -PLATFORMS="~amd64 ~x86" - -DEFAULT_SRC_PREPARE_PATCHES=( "${FILES}"/Fix-build-prefixed-tools.patch ) - diff --git a/packages/dev-lang/ocaml/ocaml-4.03.0.exheres-0 b/packages/dev-lang/ocaml/ocaml-4.07.0.exheres-0 similarity index 60% rename from packages/dev-lang/ocaml/ocaml-4.03.0.exheres-0 rename to packages/dev-lang/ocaml/ocaml-4.07.0.exheres-0 index d8620f2..e466f83 100644 --- a/packages/dev-lang/ocaml/ocaml-4.03.0.exheres-0 +++ b/packages/dev-lang/ocaml/ocaml-4.07.0.exheres-0 @@ -1,5 +1,5 @@ # Distributed under the terms of the GNU General Public License v2 -# Copyright 2013 Nicolas Braud-Santoni +# Copyright 2018 Danilo Spinella require ocaml diff --git a/packages/dev-lang/ocaml/ocaml.exlib b/packages/dev-lang/ocaml/ocaml.exlib index 33b6e2b..5c7dd21 100644 --- a/packages/dev-lang/ocaml/ocaml.exlib +++ b/packages/dev-lang/ocaml/ocaml.exlib @@ -20,7 +20,7 @@ http://ocaml.org/ [[ description = [ Community-driven web LICENCES="|| ( LGPL-2 QPL-1.0 )" MY_PNV=${PN}-$(ever replace 3 +) -DOWNLOADS="http://caml.inria.fr/pub/distrib/${PN}-$(ever range 1-2)/${MY_PNV}.tar.xz" +DOWNLOADS="http://caml.inria.fr/pub/distrib/${PN}-$(ever range 1-2)/${MY_PNV}.tar.gz" WORK="${WORKBASE}"/${MY_PNV} BUGS_TO="fauxmight@nosocomia.com nicolas+exherbo@braud-santoni.eu" @@ -61,8 +61,7 @@ ocaml_src_configure() { ocaml_src_compile() { # parallel builds are broken so often, its not even worth trying anymore - emake -j1 AR=${AR} world - emake -j1 AR=${AR} opt opt.opt + emake AR=${AR} world.opt } ocaml_src_install() { @@ -70,9 +69,6 @@ ocaml_src_install() { LIBDIR="${IMAGE}/usr/$(exhost --target)/lib/ocaml" \ MANDIR="${IMAGE}/usr/share/man" install - # empty directory - edo rmdir "${IMAGE}/usr/$(exhost --target)/lib/ocaml/ocamldoc/custom" - # Remove man directory if needed option !doc && edo rm -rf "${IMAGE}"/usr/share/man/man3 @@ -85,14 +81,6 @@ ocaml_src_install() { dodir /usr/$(exhost --target)/include dosym /usr/$(exhost --target)/lib/ocaml/caml /usr/$(exhost --target)/include - # remove references to ${IMAGE} - edo sed \ - -e "s:${IMAGE}::g" \ - -i "${IMAGE}"/usr/$(exhost --target)/lib/ocaml/ld.conf - edo sed \ - -e "s|^\(CAMLRUN=\).*|\1/usr/$(exhost --target)/bin/ocamlrun|" \ - -i "${IMAGE}"/usr/$(exhost --target)/lib/ocaml/Makefile.config - emagicdocs }