Merge pull request #202793 from erdnaxe/unicorn-remove-patch
This commit is contained in:
commit
2d8ce51e3c
@ -9,21 +9,15 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "unicorn";
|
||||
version = "2.0.1";
|
||||
version = "2.0.1.post1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "unicorn-engine";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-D8kwrHo58zksVjB13VtzoVqmz++FRfJ4zI2CT+YeBVE=";
|
||||
hash = "sha256-Jz5C35rwnDz0CXcfcvWjkwScGNQO1uijF7JrtZhM7mI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix compilation on aarch64-darwin
|
||||
# See https://github.com/unicorn-engine/unicorn/issues/1730
|
||||
./tests_unit_endian_aarch64.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
|
@ -1,20 +0,0 @@
|
||||
diff --git a/tests/unit/endian.h b/tests/unit/endian.h
|
||||
index 5bc86308..b455899e 100644
|
||||
--- a/tests/unit/endian.h
|
||||
+++ b/tests/unit/endian.h
|
||||
@@ -54,6 +54,7 @@
|
||||
|| defined(_POWER) || defined(__powerpc__) \
|
||||
|| defined(__ppc__) || defined(__hpux) || defined(__hppa) \
|
||||
|| defined(_MIPSEB) || defined(_POWER) \
|
||||
+ || defined(__ARMEB__) || defined(__AARCH64EB__) \
|
||||
|| defined(__s390__)
|
||||
# define BOOST_BIG_ENDIAN
|
||||
# define BOOST_BYTE_ORDER 4321
|
||||
@@ -63,6 +64,7 @@
|
||||
|| defined(_M_ALPHA) || defined(__amd64) \
|
||||
|| defined(__amd64__) || defined(_M_AMD64) \
|
||||
|| defined(__x86_64) || defined(__x86_64__) \
|
||||
+ || defined(__ARMEL__) || defined(__AARCH64EL__) \
|
||||
|| defined(_M_X64) || defined(__bfin__)
|
||||
|
||||
# define BOOST_LITTLE_ENDIAN
|
Loading…
Reference in New Issue
Block a user