summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandre Bouvier2021-08-24 19:49:59 +0200
committerAlexandre Bouvier2021-08-24 19:49:59 +0200
commitf48a9b11d5ade44e0dee8eea58205653c0a691e8 (patch)
tree494f2a0d2d51f88edff46728f93a8b133cc4b44b
parent36a6ff76e1376238df7108ccbb4d09600e899556 (diff)
downloadaur-f48a9b11d5ade44e0dee8eea58205653c0a691e8.tar.gz
update pull request patches
Diffstat
-rw-r--r--.SRCINFO18
-rw-r--r--PKGBUILD31
-rw-r--r--unbundle-catch2.patch24
-rw-r--r--unbundle-fmt.patch12
-rw-r--r--unbundle-robin-map.patch26
-rw-r--r--unbundle-xbyak.patch14
-rw-r--r--unbundle-zydis.patch25
7 files changed, 17 insertions, 133 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 461567d213d1..200f32d877f8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = dynarmic-git
pkgdesc = An ARM dynamic recompiler
pkgver = 5.r113.g517e35f8
- pkgrel = 2
+ pkgrel = 3
url = https://github.com/MerryMage/dynarmic
arch = x86_64
license = BSD
@@ -17,19 +17,11 @@ pkgbase = dynarmic-git
provides = libdynarmic.so
conflicts = dynarmic
source = git+https://github.com/MerryMage/dynarmic.git
- source = 0002-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
+ source = 0004-dynarmic-add-cmake-install-rules.patch::https://github.com/MerryMage/dynarmic/pull/636.patch
+ source = 0001-dynarmic-unbundle-all.patch::https://github.com/MerryMage/dynarmic/pull/641.patch
b2sums = SKIP
- b2sums = bb8bfeccd4a944a36df33ce77bc15a8680bd06c80aeabac17ff052fc651468f559625ca0b1db52bd3badd228270f0e5dd0958d65710f8f3be67ed91be7464948
- b2sums = d5adb75e25b1f3cb297f781d4c00d978d234912ca7fcb4e206e7f7779ccbe9a9d747c652a6fc2d8af55442b457dc8d496f3708b67fa0072aba8cdf5aba15bdde
- b2sums = 4bcf176ce2a82cbaf54f9eb0b463844e77c099e5824fb9d994817dd8a5b75ea1abebf17da4c01be14042ce36564d8df5836e9a02a5cbe92bb95d7232263123b4
- b2sums = d474ec20f085832c73de96b19a06b5d8018d6fb429ea054a9e026c1d56f12035b83bc3b980487825ecb473b674a7b22f2b92733bdb53d71dcb1528318f2a5d80
- b2sums = 92d760e22bebe7d07bee8fdcc4d142ae8bc11e73c1d6e89e3964d07a1618c3ad4516eeaa262b6f7046a8b483c4b56d2e509b170fe9acf48eea7523210c0e9fa7
- b2sums = df66b3be7d940ed9b6a9ab6e387e9b239bb49c958d2f255f68861c39a5eea48113c4a6faad10553876f44178678f188c7db97d2db390aaacbacd76ea1336ac7e
+ b2sums = 64ee1b918bd3fd6d96be2f5cdea58bfbedfdd37c857d95cc5b51f1721cb3c8b7624b2dfdd3249e520bfbc490a4ffd99ae1107e4f083fb3c05976005bf27f11f1
+ b2sums = 46aa8fced5222e877673b248431b3abf1166b50c42df34c0be54da298174c3a35a8e6824a928c5968d126d28bd7b043b4cd09298224b6b71b02044d707724483
pkgname = dynarmic-git
depends = libfmt.so
diff --git a/PKGBUILD b/PKGBUILD
index e23b5b13e4b1..ea8033f3eb84 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
_pkgname=dynarmic
pkgname=$_pkgname-git
pkgver=5.r113.g517e35f8
-pkgrel=2
+pkgrel=3
pkgdesc='An ARM dynamic recompiler'
arch=('x86_64')
url="https://github.com/MerryMage/$_pkgname"
@@ -21,21 +21,14 @@ provides=("$_pkgname=$pkgver" 'libdynarmic.so')
conflicts=("$_pkgname")
source=(
"git+$url.git"
- "0002-dynarmic-add-cmake-install-rules.patch::$url/pull/636.patch"
- 'unbundle-catch2.patch'
- 'unbundle-fmt.patch'
- 'unbundle-robin-map.patch'
- 'unbundle-xbyak.patch'
- 'unbundle-zydis.patch'
+ "0004-dynarmic-add-cmake-install-rules.patch::$url/pull/636.patch"
+ "0001-dynarmic-unbundle-all.patch::$url/pull/641.patch"
+
)
b2sums=(
'SKIP'
- 'bb8bfeccd4a944a36df33ce77bc15a8680bd06c80aeabac17ff052fc651468f559625ca0b1db52bd3badd228270f0e5dd0958d65710f8f3be67ed91be7464948'
- 'd5adb75e25b1f3cb297f781d4c00d978d234912ca7fcb4e206e7f7779ccbe9a9d747c652a6fc2d8af55442b457dc8d496f3708b67fa0072aba8cdf5aba15bdde'
- '4bcf176ce2a82cbaf54f9eb0b463844e77c099e5824fb9d994817dd8a5b75ea1abebf17da4c01be14042ce36564d8df5836e9a02a5cbe92bb95d7232263123b4'
- 'd474ec20f085832c73de96b19a06b5d8018d6fb429ea054a9e026c1d56f12035b83bc3b980487825ecb473b674a7b22f2b92733bdb53d71dcb1528318f2a5d80'
- '92d760e22bebe7d07bee8fdcc4d142ae8bc11e73c1d6e89e3964d07a1618c3ad4516eeaa262b6f7046a8b483c4b56d2e509b170fe9acf48eea7523210c0e9fa7'
- 'df66b3be7d940ed9b6a9ab6e387e9b239bb49c958d2f255f68861c39a5eea48113c4a6faad10553876f44178678f188c7db97d2db390aaacbacd76ea1336ac7e'
+ '64ee1b918bd3fd6d96be2f5cdea58bfbedfdd37c857d95cc5b51f1721cb3c8b7624b2dfdd3249e520bfbc490a4ffd99ae1107e4f083fb3c05976005bf27f11f1'
+ '46aa8fced5222e877673b248431b3abf1166b50c42df34c0be54da298174c3a35a8e6824a928c5968d126d28bd7b043b4cd09298224b6b71b02044d707724483'
)
pkgver() {
@@ -45,12 +38,8 @@ pkgver() {
prepare() {
cd $_pkgname
- patch -Np1 < ../0002-dynarmic-add-cmake-install-rules.patch
- patch -Np1 < ../unbundle-catch2.patch
- patch -Np1 < ../unbundle-fmt.patch
- patch -Np1 < ../unbundle-robin-map.patch
- patch -Np1 < ../unbundle-xbyak.patch
- patch -Np1 < ../unbundle-zydis.patch
+ patch -Np1 < ../0004-dynarmic-add-cmake-install-rules.patch
+ patch -Np1 < ../0001-dynarmic-unbundle-all.patch
}
build() {
@@ -59,7 +48,11 @@ build() {
-DCMAKE_BUILD_TYPE=None \
-DCMAKE_INSTALL_PREFIX=/usr \
-DDYNARMIC_IGNORE_ASSERTS=ON \
+ -DDYNARMIC_NO_BUNDLED_CATCH=ON \
-DDYNARMIC_NO_BUNDLED_FMT=ON \
+ -DDYNARMIC_NO_BUNDLED_ROBIN_MAP=ON \
+ -DDYNARMIC_NO_BUNDLED_XBYAK=ON \
+ -DDYNARMIC_NO_BUNDLED_ZYDIS=ON \
-DDYNARMIC_TESTS="$CHECKFUNC" \
-Wno-dev
cmake --build build
diff --git a/unbundle-catch2.patch b/unbundle-catch2.patch
deleted file mode 100644
index 2d739d6b1bb5..000000000000
--- a/unbundle-catch2.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -142,5 +142,7 @@ add_subdirectory(externals)
- # Dynarmic project files
- add_subdirectory(src/dynarmic)
- if (DYNARMIC_TESTS)
-+ find_package(Catch2 REQUIRED)
-+ add_library(catch ALIAS Catch2::Catch2)
- add_subdirectory(tests)
- endif()
---- a/externals/CMakeLists.txt
-+++ b/externals/CMakeLists.txt
-@@ -2,11 +2,6 @@
- # simply add the directory to that file as a subdirectory
- # to have CMake automatically recognize them.
-
--# catch
--
--add_library(catch INTERFACE)
--target_include_directories(catch INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/catch/include>)
--
- # fmt
-
- if (NOT DYNARMIC_NO_BUNDLED_FMT)
diff --git a/unbundle-fmt.patch b/unbundle-fmt.patch
deleted file mode 100644
index 9e5ca505b1e9..000000000000
--- a/unbundle-fmt.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -136,6 +136,9 @@ if (DYNARMIC_TESTS_USE_UNICORN)
- find_package(Unicorn REQUIRED)
- endif()
-
-+find_package(fmt REQUIRED)
-+add_library(fmt ALIAS fmt::fmt)
-+
- # Pull in externals CMakeLists for libs where available
- add_subdirectory(externals)
-
diff --git a/unbundle-robin-map.patch b/unbundle-robin-map.patch
deleted file mode 100644
index ecc1b743acd5..000000000000
--- a/unbundle-robin-map.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -136,6 +136,8 @@ if (DYNARMIC_TESTS_USE_UNICORN)
- find_package(Unicorn REQUIRED)
- endif()
-
-+find_package(tsl-robin-map REQUIRED)
-+
- # Pull in externals CMakeLists for libs where available
- add_subdirectory(externals)
-
---- a/externals/CMakeLists.txt
-+++ b/externals/CMakeLists.txt
-@@ -19,12 +19,6 @@ endif()
- add_library(mp INTERFACE)
- target_include_directories(mp INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/mp/include>)
-
--# robin-map
--
--add_library(robin_map INTERFACE)
--add_library(tsl::robin_map ALIAS robin_map)
--target_include_directories(robin_map SYSTEM INTERFACE "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/robin-map/include>")
--
- # vixl
-
- if (ARCHITECTURE STREQUAL "arm64")
diff --git a/unbundle-xbyak.patch b/unbundle-xbyak.patch
deleted file mode 100644
index d3384754f45c..000000000000
--- a/unbundle-xbyak.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -136,6 +136,11 @@ if (DYNARMIC_TESTS_USE_UNICORN)
- find_package(Unicorn REQUIRED)
- endif()
-
-+if (ARCHITECTURE STREQUAL "x86" OR ARCHITECTURE STREQUAL "x86_64")
-+ find_package(xbyak REQUIRED)
-+ add_library(xbyak ALIAS xbyak::xbyak)
-+endif()
-+
- # Pull in externals CMakeLists for libs where available
- add_subdirectory(externals)
-
diff --git a/unbundle-zydis.patch b/unbundle-zydis.patch
deleted file mode 100644
index da2a0c93bde6..000000000000
--- a/unbundle-zydis.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -137,6 +137,9 @@ if (DYNARMIC_TESTS_USE_UNICORN)
- find_package(Unicorn REQUIRED)
- endif()
-
-+find_package(Zydis REQUIRED)
-+add_library(Zydis ALIAS Zydis::Zydis)
-+
- # Pull in externals CMakeLists for libs where available
- add_subdirectory(externals)
-
---- a/externals/CMakeLists.txt
-+++ b/externals/CMakeLists.txt
-@@ -42,10 +42,3 @@ if (NOT TARGET xbyak)
- target_compile_definitions(xbyak INTERFACE XBYAK_NO_OP_NAMES)
- endif()
- endif()
--
--# zydis
--
--option(ZYDIS_BUILD_TOOLS "" OFF)
--option(ZYDIS_BUILD_EXAMPLES "" OFF)
--set(ZYDIS_ZYCORE_PATH "${CMAKE_CURRENT_LIST_DIR}/zycore" CACHE PATH "")
--add_subdirectory(zydis EXCLUDE_FROM_ALL)