Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] ocaml: Bump to version 4.07.0 #2

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[WIP] ocaml: Bump to version 4.07.0 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions metadata/repository_mask.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
dev-lang/ocaml [[
author = [ Nikolay Orliuk <virkony@gmail.com> ]
date = [ 3 May 2015 ]
token = broken
description = [ Incomplete migration to multiarch (TODO cross targets) ]
]]

dev-lang/coq[=scm] [[
author = [ Alex Elsayed <eternaleye@gmail.com> ]
date = [ 10 October 2016 ]
Expand Down
68 changes: 0 additions & 68 deletions packages/dev-lang/ocaml/files/Fix-build-prefixed-tools.patch
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions packages/dev-lang/ocaml/ocaml-4.02.1-r2.exheres-0
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ...ges/dev-lang/ocaml/ocaml-4.03.0.exheres-0 → ...ges/dev-lang/ocaml/ocaml-4.07.0.exheres-0
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Distributed under the terms of the GNU General Public License v2
# Copyright 2013 Nicolas Braud-Santoni <nicolas+exherbo@braud-santoni.eu>
# Copyright 2018 Danilo Spinella <danyspin97@protonmail.com>

require ocaml

Expand Down
16 changes: 2 additions & 14 deletions packages/dev-lang/ocaml/ocaml.exlib
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -61,18 +61,14 @@ 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() {
emake BINDIR="${IMAGE}/usr/$(exhost --target)/bin" \
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

Expand All @@ -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
}