summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAbdo Roig-Maranges2018-07-14 23:58:13 +0200
committerAbdo Roig-Maranges2018-07-14 23:58:21 +0200
commitaad863cfc17511179f8ff5c1e28b89c918b85826 (patch)
tree17dfb7134be9cbf6edee29d27b6582a8769680d6
parent3399e36fa95184212dc2d915235dcb72bd15b594 (diff)
downloadaur-aad863cfc17511179f8ff5c1e28b89c918b85826.tar.gz
remove patch that got merged upstream
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD10
-rw-r--r--fix-llvm-build.patch19
3 files changed, 2 insertions, 29 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e2e2e0979ea..4f1fbc2b7fe 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -17,8 +17,6 @@ pkgbase = extempore-git
provides = extempore
conflicts = extempore
source = git+https://github.com/digego/extempore.git
- source = fix-llvm-build.patch
- sha256sums = SKIP
sha256sums = SKIP
pkgname = extempore-git
diff --git a/PKGBUILD b/PKGBUILD
index 02fc820c105..e5c74a165ba 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,19 +12,13 @@ makedepends=('git' 'cmake' 'gcc' 'perl')
optdepends=('jack')
provides=('extempore')
conflicts=('extempore')
-source=("git+https://github.com/digego/extempore.git"
- "fix-llvm-build.patch")
-sha256sums=('SKIP' 'SKIP')
+source=("git+https://github.com/digego/extempore.git")
+sha256sums=('SKIP')
pkgver() {
git --git-dir="${srcdir}/extempore/.git" describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
}
-prepare() {
- cd "${srcdir}/extempore"
- patch -p1 -i "${srcdir}/fix-llvm-build.patch"
-}
-
build() {
mkdir -p "${srcdir}/build"
cd "${srcdir}/build"
diff --git a/fix-llvm-build.patch b/fix-llvm-build.patch
deleted file mode 100644
index 33caebd69b4..00000000000
--- a/fix-llvm-build.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/extras/extempore-llvm-3.8.0.patch b/extras/extempore-llvm-3.8.0.patch
-index 84a92d48..c543cbe4 100644
---- a/extras/extempore-llvm-3.8.0.patch
-+++ b/extras/extempore-llvm-3.8.0.patch
-@@ -35,3 +35,14 @@
- break;
- }
- }
-+--- include/llvm/IR/ValueMap.h 2015-08-04 00:30:24.000000000 +0200
-++++ include/llvm/IR/ValueMap.h 2018-07-14 21:09:09.769502736 +0200
-+@@ -99,7 +99,7 @@
-+ explicit ValueMap(const ExtraData &Data, unsigned NumInitBuckets = 64)
-+ : Map(NumInitBuckets), Data(Data) {}
-+
-+- bool hasMD() const { return MDMap; }
-++ bool hasMD() const { return static_cast<bool>(MDMap); }
-+ MDMapT &MD() {
-+ if (!MDMap)
-+ MDMap.reset(new MDMapT);