summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandre Bouvier2021-08-07 16:45:52 +0200
committerAlexandre Bouvier2021-08-07 16:45:52 +0200
commit49ffa3396cb12cb4dc2cab4f1e89e1461ab9173c (patch)
tree7b8560271004bc975af8bcd70cf80c082387be08
parent4d4be37a6cee7c73dd2f608fb4928bd9d2b7f03d (diff)
downloadaur-49ffa3396cb12cb4dc2cab4f1e89e1461ab9173c.tar.gz
fix cmake patch
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD6
2 files changed, 5 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0519f907e1a2..32e9b2d1fc9b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -17,12 +17,14 @@ pkgbase = dynarmic-git
provides = libdynarmic.so
conflicts = dynarmic
source = git+https://github.com/MerryMage/dynarmic.git
+ source = dynarmic-add-cmake-install-rules.patch::https://github.com/MerryMage/dynarmic/pull/636.patch
source = unbundle-catch2.patch
source = unbundle-fmt.patch
source = unbundle-robin-map.patch
source = unbundle-xbyak.patch
source = unbundle-zydis.patch
b2sums = SKIP
+ b2sums = 027a8eae057b4b4aeb1cd278719c49cc824206a9b1ab9ee1e2c2dd2b194efc114fde3f7c74d12f2b7d6dc199d208cdadf2c3da9575542b01c14536fe0335b5e9
b2sums = 7047d87826551417b188afc0d0fef5768840b4110c556c3471411a3ba94a0c270b5996e49a3e97211bc076f80b652a9995c26023a3559976d0eb708ffc4f8436
b2sums = e17436a93047f2b43de9aa5013d48daafe924a1c177c0c76d5fb61887ff250ca97262d10c54239e0b5558a4bba191230041b82f93529e5039da53bccb7111fbf
b2sums = 0d88d24bc5b44a9a67b4054ccd1ab4da87a1b954ea85c14f010a3aa9684d198360fcded8c12a9865c621ca841e95da119fe32948e51bbc954b1f0ff8f366d11e
diff --git a/PKGBUILD b/PKGBUILD
index 8cc99ecb03ab..16daf08f3ab9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -21,6 +21,7 @@ provides=("$_pkgname=$pkgver" 'libdynarmic.so')
conflicts=("$_pkgname")
source=(
"git+$url.git"
+ 'dynarmic-add-cmake-install-rules.patch::https://github.com/MerryMage/dynarmic/pull/636.patch'
'unbundle-catch2.patch'
'unbundle-fmt.patch'
'unbundle-robin-map.patch'
@@ -29,6 +30,7 @@ source=(
)
b2sums=(
'SKIP'
+ '027a8eae057b4b4aeb1cd278719c49cc824206a9b1ab9ee1e2c2dd2b194efc114fde3f7c74d12f2b7d6dc199d208cdadf2c3da9575542b01c14536fe0335b5e9'
'7047d87826551417b188afc0d0fef5768840b4110c556c3471411a3ba94a0c270b5996e49a3e97211bc076f80b652a9995c26023a3559976d0eb708ffc4f8436'
'e17436a93047f2b43de9aa5013d48daafe924a1c177c0c76d5fb61887ff250ca97262d10c54239e0b5558a4bba191230041b82f93529e5039da53bccb7111fbf'
'0d88d24bc5b44a9a67b4054ccd1ab4da87a1b954ea85c14f010a3aa9684d198360fcded8c12a9865c621ca841e95da119fe32948e51bbc954b1f0ff8f366d11e'
@@ -43,9 +45,7 @@ pkgver() {
prepare() {
cd $_pkgname
- # add cmake install rules
- git pull --squash origin pull/636/head
- # unbundle externals
+ patch -Np1 < ../dynarmic-add-cmake-install-rules.patch
patch -Np1 < ../unbundle-catch2.patch
patch -Np1 < ../unbundle-fmt.patch
patch -Np1 < ../unbundle-robin-map.patch