diff options
author | J5lx | 2016-02-06 05:30:36 +0100 |
---|---|---|
committer | J5lx | 2016-02-06 05:30:36 +0100 |
commit | 49cfbe058f7f832ef0440f94bfca75fc2ffe6baf (patch) | |
tree | ed3d01116d3a948e22f536d9acc41fa14e71eb2b | |
parent | e76e065da6781aa0fe9b9fa8cbcd7afceddbaad8 (diff) | |
download | aur-49cfbe058f7f832ef0440f94bfca75fc2ffe6baf.tar.gz |
113.24.00-1: New version
-rw-r--r-- | .SRCINFO | 22 | ||||
-rw-r--r-- | PKGBUILD | 21 | ||||
-rw-r--r-- | libdir.patch | 36 |
3 files changed, 66 insertions, 13 deletions
@@ -1,6 +1,8 @@ +# Generated by mksrcinfo v8 +# Sat Feb 6 04:30:18 UTC 2016 pkgbase = ocaml-core_bench pkgdesc = A micro-benchmarking library for ocaml - pkgver = 112.35.00 + pkgver = 113.24.00 pkgrel = 1 url = https://github.com/janestreet/core_bench arch = i686 @@ -9,16 +11,24 @@ pkgbase = ocaml-core_bench makedepends = ocaml-findlib depends = ocaml depends = ocaml-bin_prot - depends = camlp4 - depends = ocaml-comparelib depends = ocaml-core + depends = ocaml-core_extended depends = ocaml-fieldslib - depends = ocaml-pa_ounit + 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-textutils + depends = ocaml-typerep + depends = ocaml-variantslib options = !strip - source = https://ocaml.janestreet.com/ocaml-core/112.35/files/core_bench-112.35.00.tar.gz - md5sums = f2811e531a07264006767ea98f9e98ff + source = https://ocaml.janestreet.com/ocaml-core/113.24/files/core_bench-113.24.00.tar.gz + source = libdir.patch + md5sums = ea8cdcc38e900e6ee0c3fa211214b5d0 + md5sums = 7f0a951f1ac87385272ea7a6dd58762a pkgname = ocaml-core_bench @@ -1,20 +1,29 @@ # Maintainer: Jakob Gahde <j5lx@fmail.co.uk> pkgname=ocaml-core_bench -pkgver=112.35.00 +pkgver=113.24.00 pkgrel=1 license=('unknown') arch=('i686' 'x86_64') pkgdesc="A micro-benchmarking library for ocaml" url="https://github.com/janestreet/core_bench" -depends=('ocaml' 'ocaml-bin_prot' 'camlp4' 'ocaml-comparelib' 'ocaml-core' 'ocaml-fieldslib' 'ocaml-pa_ounit' 'ocaml-sexplib' 'ocaml-textutils') +depends=('ocaml' 'ocaml-bin_prot' 'ocaml-core' 'ocaml-core_extended' 'ocaml-fieldslib' 'ocaml-ppx_assert' 'ocaml-ppx_bench' 'ocaml-ppx_driver' 'ocaml-ppx_expect' 'ocaml-ppx_inline_test' 'ocaml-ppx_jane' 'ocaml-sexplib' 'ocaml-textutils' 'ocaml-typerep' 'ocaml-variantslib') makedepends=('ocaml-findlib') -source=("https://ocaml.janestreet.com/ocaml-core/$(echo ${pkgver} | grep -Po "^[0-9]+\.[0-9]+")/files/${pkgname#ocaml-}-${pkgver}.tar.gz") +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=('f2811e531a07264006767ea98f9e98ff') +md5sums=('ea8cdcc38e900e6ee0c3fa211214b5d0' + '7f0a951f1ac87385272ea7a6dd58762a') + +prepare() { + cd "${srcdir}/${pkgname#ocaml-}-${pkgver}" + + patch -Np1 < "${srcdir}/libdir.patch" +} build() { cd "${srcdir}/${pkgname#ocaml-}-${pkgver}" + ./configure --prefix /usr make } @@ -22,7 +31,5 @@ build() { package() { cd "${srcdir}/${pkgname#ocaml-}-${pkgver}" - export OCAMLFIND_DESTDIR="${pkgdir}$(ocamlfind printconf destdir)" - mkdir -p "$OCAMLFIND_DESTDIR/stublibs" - make install + make install LIBDIR="${pkgdir}$(ocamlc -where)" } diff --git a/libdir.patch b/libdir.patch new file mode 100644 index 000000000000..6284fcd558b0 --- /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 + |