summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Peukert2020-05-08 12:03:03 +0200
committerDaniel Peukert2020-05-08 12:03:03 +0200
commit7a7bb1bb381049389bb3d1526f5de16693edcdb5 (patch)
treed07e1350eebe05d3c2bf36e48a05e731feac5eaa
parent7fd1467213e2a10539a7665452d3923508d8b0e5 (diff)
downloadaur-7a7bb1bb381049389bb3d1526f5de16693edcdb5.tar.gz
Fix ocaml-visitors build and get rid of dune 2 patch
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD23
-rw-r--r--dune-version.diff10
3 files changed, 9 insertions, 32 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7f668b6ee07..22ded0aab86 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = ocaml-visitors
pkgdesc = An OCaml syntax extension for generating visitor classes
pkgver = 20200210
- pkgrel = 2
+ pkgrel = 3
url = https://gitlab.inria.fr/fpottier/visitors
arch = x86_64
arch = i686
@@ -11,15 +11,13 @@ pkgbase = ocaml-visitors
arch = aarch64
license = LGPL2.1
makedepends = cppo
- makedepends = dune
+ makedepends = dune>=2.0.0
depends = ocaml>=4.02.3
depends = ocaml-ppx_deriving>=4.4
depends = ocaml-ppx_tools
depends = ocaml-result
options = !strip
- source = ocaml-visitors-20200210-2.tar.gz::https://gitlab.inria.fr/fpottier/visitors/-/archive/20200210/visitors-20200210.tar.gz
- source = dune-version.diff
+ source = ocaml-visitors-20200210-3.tar.gz::https://gitlab.inria.fr/fpottier/visitors/-/archive/20200210/visitors-20200210.tar.gz
sha256sums = b26ef1da80399af92f9da2f818c078317961daa4a68645e31160c1b0f4b8843e
- sha256sums = ed20ebe5ade715ac0d439ad01cd6e3cfad908ef09705a069d069bae0a251f7f6
pkgname = ocaml-visitors
diff --git a/PKGBUILD b/PKGBUILD
index 1598e180028..f9ee4358f2c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,38 +3,27 @@
_projectname='visitors'
pkgname="ocaml-$_projectname"
pkgver='20200210'
-pkgrel='2'
+pkgrel='3'
pkgdesc='An OCaml syntax extension for generating visitor classes'
arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h' 'aarch64')
url="https://gitlab.inria.fr/fpottier/$_projectname"
license=('LGPL2.1')
depends=('ocaml>=4.02.3' 'ocaml-ppx_deriving>=4.4' 'ocaml-ppx_tools' 'ocaml-result')
-makedepends=('cppo' 'dune')
+makedepends=('cppo' 'dune>=2.0.0')
options=('!strip')
-source=(
- "$pkgname-$pkgver-$pkgrel.tar.gz::$url/-/archive/$pkgver/$_projectname-$pkgver.tar.gz"
- 'dune-version.diff'
-)
-sha256sums=('b26ef1da80399af92f9da2f818c078317961daa4a68645e31160c1b0f4b8843e'
- 'ed20ebe5ade715ac0d439ad01cd6e3cfad908ef09705a069d069bae0a251f7f6')
+source=("$pkgname-$pkgver-$pkgrel.tar.gz::$url/-/archive/$pkgver/$_projectname-$pkgver.tar.gz")
+sha256sums=('b26ef1da80399af92f9da2f818c078317961daa4a68645e31160c1b0f4b8843e')
_sourcedirectory="$_projectname-$pkgver"
-prepare() {
- cd "$srcdir/$_sourcedirectory/"
- # Needed until Arch upgrades to dune>=2.0.0
- patch --forward -p1 < '../dune-version.diff'
-}
-
build() {
cd "$srcdir/$_sourcedirectory/"
- dune build -p "$_projectname" --verbose
+ dune build --release --verbose
}
package() {
cd "$srcdir/$_sourcedirectory/"
- dune build --profile 'release' --verbose @install
- DESTDIR="$pkgdir" dune install --prefix '/usr' --libdir 'lib/ocaml'
+ DESTDIR="$pkgdir" dune install --prefix '/usr' --libdir 'lib/ocaml' --release --verbose
install -dm755 "$pkgdir/usr/share/doc/$pkgname"
mv "$pkgdir/usr/doc/$_projectname/"* "$pkgdir/usr/share/doc/$pkgname/"
diff --git a/dune-version.diff b/dune-version.diff
deleted file mode 100644
index e02860cf93b..00000000000
--- a/dune-version.diff
+++ /dev/null
@@ -1,10 +0,0 @@
-diff --git a/dune-project b/dune-project
-index 9efd891..c99bd5e 100644
---- a/dune-project
-+++ b/dune-project
-@@ -1,4 +1,4 @@
--(lang dune 2.0)
-+(lang dune 1.11)
- (name visitors)
- (version 20200210)
- (package