summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathaniel R. Lewis2017-09-19 10:16:10 -0700
committerNathaniel R. Lewis2017-09-19 10:16:10 -0700
commit4c64b4c118bb4ca736edaba400f09fd72864d4a4 (patch)
tree459726daeaced90c75c2977744c41ef39839f640
parentfbc28f4101ba9e836c24494f78b6189c1d4807fa (diff)
downloadaur-4c64b4c118bb4ca736edaba400f09fd72864d4a4.tar.gz
removed patch that has been upstreamed
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD13
-rw-r--r--create-installation-paths.patch34
3 files changed, 4 insertions, 47 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 94376a070245..d8d880d60954 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = herdtools7-git
pkgdesc = The Herd toolsuite to deal with .cat memory models
- pkgver = r742.f2bb279
+ pkgver = r744.6192a9b
pkgrel = 1
url = https://github.com/herd/herdtools7
arch = i686
@@ -13,9 +13,7 @@ pkgbase = herdtools7-git
provides = herdtools7
conflicts = herdtools7
source = git://github.com/herd/herdtools7
- source = create-installation-paths.patch
sha256sums = SKIP
- sha256sums = a7b8c376201196064835fba0d646bee567fe2932900772045a75b6bdd2a9a2ff
pkgname = herdtools7-git
diff --git a/PKGBUILD b/PKGBUILD
index 8c63fe19f454..c58898afc03f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@ _pkgbase='herdtools7'
pkgname=('herdtools7-git')
provides=('herdtools7')
conflicts=('herdtools7')
-pkgver=r742.f2bb279
+pkgver=r744.6192a9b
pkgrel=1
pkgdesc="The Herd toolsuite to deal with .cat memory models"
arch=('i686' 'x86_64')
@@ -12,15 +12,8 @@ url='https://github.com/herd/herdtools7'
license=('CeCILL-B')
depends=('ocaml')
makedepends=('git' 'make' 'ocamlbuild')
-source=('git://github.com/herd/herdtools7'
- 'create-installation-paths.patch')
-sha256sums=('SKIP'
- 'a7b8c376201196064835fba0d646bee567fe2932900772045a75b6bdd2a9a2ff')
-
-prepare() {
- cd $srcdir/$_pkgbase
- git apply ../create-installation-paths.patch
-}
+source=('git://github.com/herd/herdtools7')
+sha256sums=('SKIP')
build() {
cd $srcdir/$_pkgbase
diff --git a/create-installation-paths.patch b/create-installation-paths.patch
deleted file mode 100644
index e4df5b5e5aa0..000000000000
--- a/create-installation-paths.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From f1feb0d630b2c74d9623959da5aa946a078dde31 Mon Sep 17 00:00:00 2001
-From: Patrick McLean <chutzpah@gentoo.org>
-Date: Fri, 15 Sep 2017 10:35:10 -0700
-Subject: [PATCH] install.sh: make installation directories before trying to
- copy files to them
-
----
- install.sh | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/install.sh b/install.sh
-index 72f6163..e84c645 100755
---- a/install.sh
-+++ b/install.sh
-@@ -17,6 +17,16 @@ fi
- BINDIR=$PREFIX/bin
- LIBDIR=$PREFIX/share/herdtools7
-
-+if ! [ -d $BINDIR ]
-+then
-+ mkdir -p $BINDIR
-+fi
-+
-+if ! [ -d $LIBDIR ]
-+then
-+ mkdir -p $LIBDIR
-+fi
-+
- cpbin () {
- SUB=$1
- EXECS="$2"
---
-2.14.1
-