summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJ5lx2016-02-06 04:43:42 +0100
committerJ5lx2016-02-06 04:43:42 +0100
commit1ae565485c2108ab421eb35f07f39cdc67bd3717 (patch)
treedd2ea029b752ab4ea4e01750a64bea009f91f127
parentd7ac75fc8ce26a2987620177b0061dc843a5ac5c (diff)
downloadaur-1ae565485c2108ab421eb35f07f39cdc67bd3717.tar.gz
113.24.00-1: New version
-rw-r--r--.SRCINFO28
-rw-r--r--PKGBUILD24
-rw-r--r--libdir.patch36
3 files changed, 65 insertions, 23 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 385dfa07cdc..afc2c3c2028 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,32 +1,34 @@
+# Generated by mksrcinfo v8
+# Sat Feb 6 03:43:32 UTC 2016
pkgbase = ocaml-core
pkgdesc = Industrial strength alternative to OCaml's standard library
- pkgver = 113.00.00
+ pkgver = 113.24.00
pkgrel = 1
url = https://github.com/janestreet/core
arch = i686
arch = x86_64
license = Apache
makedepends = ocaml-findlib
+ makedepends = opam
depends = ocaml
depends = ocaml-bin_prot
- depends = camlp4
- depends = ocaml-comparelib
depends = ocaml-core_kernel
- depends = ocaml-custom_printf
- depends = ocaml-enumerate
depends = ocaml-fieldslib
- depends = ocaml-herelib
- depends = ocaml-pa_bench
- depends = ocaml-pa_ounit
- depends = ocaml-pa_structural_sexp
- depends = ocaml-pa_test
- depends = ocaml-pipebang
+ 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
optdepends = ocaml-utop: for coretop support
options = !strip
- source = https://ocaml.janestreet.com/ocaml-core/113.00/files/core-113.00.00.tar.gz
- md5sums = 9eca76d553f62f69f93cf9dcc70b0107
+ source = https://ocaml.janestreet.com/ocaml-core/113.24/files/core-113.24.00.tar.gz
+ source = libdir.patch
+ md5sums = 90aa987056d18d8be2600bc1dd0d71de
+ md5sums = 7f0a951f1ac87385272ea7a6dd58762a
pkgname = ocaml-core
diff --git a/PKGBUILD b/PKGBUILD
index 816e918cb39..730145f3f1a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,18 +1,26 @@
# Maintainer: Jakob Gahde <j5lx@fmail.co.uk>
pkgname=ocaml-core
-pkgver=113.00.00
+pkgver=113.24.00
pkgrel=1
license=('Apache')
arch=('i686' 'x86_64')
pkgdesc="Industrial strength alternative to OCaml's standard library"
url="https://github.com/janestreet/core"
-depends=('ocaml' 'ocaml-bin_prot' 'camlp4' 'ocaml-comparelib' 'ocaml-core_kernel' 'ocaml-custom_printf' 'ocaml-enumerate' 'ocaml-fieldslib' 'ocaml-herelib' 'ocaml-pa_bench' 'ocaml-pa_ounit' 'ocaml-pa_structural_sexp' 'ocaml-pa_test' 'ocaml-pipebang' 'ocaml-sexplib' 'ocaml-variantslib')
+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')
-source=("https://ocaml.janestreet.com/ocaml-core/$(echo ${pkgver} | grep -Po "^[0-9]+\.[0-9]+")/files/${pkgname#ocaml-}-${pkgver}.tar.gz")
+makedepends=('ocaml-findlib' 'opam')
+source=("https://ocaml.janestreet.com/ocaml-core/$(echo ${pkgver} | grep -Po "^[0-9]+\.[0-9]+")/files/${pkgname#ocaml-}-${pkgver}.tar.gz"
+ "libdir.patch")
options=('!strip')
-md5sums=('9eca76d553f62f69f93cf9dcc70b0107')
+md5sums=('90aa987056d18d8be2600bc1dd0d71de'
+ '7f0a951f1ac87385272ea7a6dd58762a')
+
+prepare() {
+ cd "${srcdir}/${pkgname#ocaml-}-${pkgver}"
+
+ patch -Np1 < "${srcdir}/libdir.patch"
+}
build() {
cd "${srcdir}/${pkgname#ocaml-}-${pkgver}"
@@ -24,9 +32,5 @@ build() {
package() {
cd "${srcdir}/${pkgname#ocaml-}-${pkgver}"
- export OCAMLFIND_DESTDIR="${pkgdir}$(ocamlfind printconf destdir)"
- mkdir -p "${OCAMLFIND_DESTDIR}/stublibs"
- make install
- install -Dm755 "corebuild" "${pkgdir}/usr/bin/corebuild"
- install -Dm755 "coretop" "${pkgdir}/usr/bin/coretop"
+ make install PREFIX="${pkgdir}/usr" LIBDIR="${pkgdir}$(ocamlc -where)"
}
diff --git a/libdir.patch b/libdir.patch
new file mode 100644
index 00000000000..6284fcd558b
--- /dev/null
+++ b/libdir.patch
@@ -0,0 +1,36 @@
+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
+