diff options
| -rw-r--r-- | .SRCINFO | 30 | ||||
| -rw-r--r-- | PKGBUILD | 34 | ||||
| -rw-r--r-- | libdir.patch | 36 |
3 files changed, 28 insertions, 72 deletions
@@ -1,35 +1,31 @@ # Generated by mksrcinfo v8 -# Tue Jun 6 09:23:27 UTC 2017 +# Thu Jun 28 19:52:44 UTC 2018 pkgbase = ocaml-core pkgdesc = Industrial strength alternative to OCaml's standard library - pkgver = 113.33.03 + pkgver = 0.11.1 pkgrel = 1 + epoch = 1 url = https://github.com/janestreet/core arch = i686 arch = x86_64 license = Apache - makedepends = ocaml-findlib - makedepends = ocaml-js-build-tools - makedepends = opam + makedepends = dune depends = ocaml - depends = ocaml-bin_prot + depends = ocaml-base + depends = ocaml-configurator depends = ocaml-core_kernel - depends = ocaml-fieldslib depends = ocaml-ppx_assert - depends = ocaml-ppx_bench - depends = ocaml-ppx_driver - depends = ocaml-ppx_expect - depends = ocaml-ppx_inline_test depends = ocaml-ppx_jane depends = ocaml-sexplib - depends = ocaml-typerep - depends = ocaml-variantslib + depends = ocaml-spawn + depends = ocaml-stdio + depends = ocaml-migrate-parsetree + depends = ocaml-ppxlib optdepends = ocaml-utop: for coretop support + optdepends = ocamlbuild: for corebuild support options = !strip - source = https://ocaml.janestreet.com/ocaml-core/113.33/files/core-113.33.03.tar.gz - source = libdir.patch - md5sums = 3a8c63205917a85de8ed597c11c1fc76 - md5sums = 7f0a951f1ac87385272ea7a6dd58762a + source = https://github.com/janestreet/core/releases/download/v0.11.1/core-v0.11.1.tbz + md5sums = 93ee333a0027bcda7cca3b323171d13b pkgname = ocaml-core @@ -1,36 +1,32 @@ # Maintainer: Jakob Gahde <j5lx@fmail.co.uk> pkgname=ocaml-core -pkgver=113.33.03 +pkgver=0.11.1 pkgrel=1 +epoch=1 pkgdesc="Industrial strength alternative to OCaml's standard library" arch=('i686' 'x86_64') url="https://github.com/janestreet/core" license=('Apache') -depends=('ocaml' 'ocaml-bin_prot' 'ocaml-core_kernel' 'ocaml-fieldslib' 'ocaml-ppx_assert' 'ocaml-ppx_bench' 'ocaml-ppx_driver' 'ocaml-ppx_expect' 'ocaml-ppx_inline_test' 'ocaml-ppx_jane' 'ocaml-sexplib' 'ocaml-typerep' 'ocaml-variantslib') -optdepends=('ocaml-utop: for coretop support') -makedepends=('ocaml-findlib' 'ocaml-js-build-tools' 'opam') +depends=('ocaml' 'ocaml-base' 'ocaml-configurator' 'ocaml-core_kernel' 'ocaml-ppx_assert' 'ocaml-ppx_jane' 'ocaml-sexplib' 'ocaml-spawn' 'ocaml-stdio' 'ocaml-migrate-parsetree' 'ocaml-ppxlib') +optdepends=('ocaml-utop: for coretop support' + 'ocamlbuild: for corebuild support') +makedepends=('dune') options=('!strip') -source=("https://ocaml.janestreet.com/ocaml-core/$(echo ${pkgver} | grep -Po "^[0-9]+\.[0-9]+")/files/${pkgname#ocaml-}-${pkgver}.tar.gz" - "libdir.patch") -md5sums=('3a8c63205917a85de8ed597c11c1fc76' - '7f0a951f1ac87385272ea7a6dd58762a') - -prepare() { - cd "${srcdir}/${pkgname#ocaml-}-${pkgver}" - - patch -Np1 < "${srcdir}/libdir.patch" -} +source=("https://github.com/janestreet/core/releases/download/v${pkgver}/core-v${pkgver}.tbz") +md5sums=('93ee333a0027bcda7cca3b323171d13b') build() { - cd "${srcdir}/${pkgname#ocaml-}-${pkgver}" + cd "${srcdir}/core-v${pkgver}" - ./configure --prefix /usr - make + jbuilder build } package() { - cd "${srcdir}/${pkgname#ocaml-}-${pkgver}" + cd "${srcdir}/core-v${pkgver}" - make install PREFIX="${pkgdir}/usr" LIBDIR="${pkgdir}$(ocamlc -where)" + install -dm755 "${pkgdir}$(ocamlfind -printconf destdir)" "${pkgdir}/usr/share" + jbuilder install --prefix "${pkgdir}/usr" --libdir "${pkgdir}$(ocamlfind -printconf destdir)" + mv "${pkgdir}/usr/doc" "${pkgdir}/usr/share/" + mv "${pkgdir}/usr/lib/ocaml/stubslibs" "${pkgdir}/usr/lib/ocaml/stublibs" # bug in opam } diff --git a/libdir.patch b/libdir.patch deleted file mode 100644 index 6284fcd558b0..000000000000 --- a/libdir.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -aur package.pristine/Makefile package.new/Makefile ---- package.pristine/Makefile 2016-02-06 01:55:14.650150309 +0100 -+++ package.new/Makefile 2016-02-06 01:57:56.012174364 +0100 -@@ -29,26 +29,26 @@ - ocaml -I js-utils js-utils/gen_install.ml - - install: $(NAME).install -- opam-installer -i --prefix $(PREFIX) $(NAME).install -+ opam-installer -i --prefix $(PREFIX) --libdir $(LIBDIR) $(NAME).install - - uninstall: $(NAME).install -- opam-installer -u --prefix $(PREFIX) $(NAME).install -+ opam-installer -u --prefix $(PREFIX) --libdir $(LIBDIR) $(NAME).install - - reinstall: $(NAME).install -- opam-installer -u --prefix $(PREFIX) $(NAME).install &> /dev/null || true -- opam-installer -i --prefix $(PREFIX) $(NAME).install -+ opam-installer -u --prefix $(PREFIX) --libdir $(LIBDIR) $(NAME).install &> /dev/null || true -+ opam-installer -i --prefix $(PREFIX) --libdir $(LIBDIR) $(NAME).install - - bin.tar.gz: $(NAME).install - rm -rf _install - mkdir _install -- opam-installer -i --prefix _install $(NAME).install -+ opam-installer -i --prefix _install --libdir $(LIBDIR) $(NAME).install - tar czf bin.tar.gz -C _install . - rm -rf _install - - bin.lzo: $(NAME).install - rm -rf _install - mkdir _install -- opam-installer -i --prefix _install $(NAME).install -+ opam-installer -i --prefix _install --libdir $(LIBDIR) $(NAME).install - cd _install && lzop -1 -P -o ../bin.lzo `find . -type f` - rm -rf _install - |