diff options
| author | Jakub Jirutka <jakub@jirutka.cz> | 2017-01-07 18:41:49 +0100 |
|---|---|---|
| committer | Jakub Jirutka <jakub@jirutka.cz> | 2017-01-07 18:42:04 +0100 |
| commit | a762bbc5d5cf9d84b64b2a47d8ea58e0c8b56a0e (patch) | |
| tree | 4ec5e5b6c52ea7927aa7eb55446420037cc6ae91 /testing | |
| parent | 7f2afb83dae6e21883216dee256cf8f19527aae3 (diff) | |
| download | aports-a762bbc5d5cf9d84b64b2a47d8ea58e0c8b56a0e.tar.bz2 aports-a762bbc5d5cf9d84b64b2a47d8ea58e0c8b56a0e.tar.xz | |
testing/rspamd: try to fix build on armhf
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/rspamd/APKBUILD | 11 | ||||
| -rw-r--r-- | testing/rspamd/CMakeLists-fix-armhf.patch | 53 |
2 files changed, 60 insertions, 4 deletions
diff --git a/testing/rspamd/APKBUILD b/testing/rspamd/APKBUILD index 14beb2454f..726efe3f1c 100644 --- a/testing/rspamd/APKBUILD +++ b/testing/rspamd/APKBUILD @@ -22,7 +22,7 @@ source="https://rspamd.com/downloads/$pkgname-$pkgver.tar.xz $pkgname.confd config.patch cmakelists.patch -" + CMakeLists-fix-armhf.patch" builddir="$srcdir/$pkgname-$pkgver" build() { @@ -111,16 +111,19 @@ c152c6a90f6ae9e5a7a1d137dfbc0305 rspamd.logrotated 0656acc12dcce7cba232857a848d0390 rspamd.initd ab12f33ad8e12a7437fb5ea4a9c92eef rspamd.confd ff0bf4f1b1447ca401865369f91418f1 config.patch -83f76787389649af63ea921f81cf35b3 cmakelists.patch" +83f76787389649af63ea921f81cf35b3 cmakelists.patch +8d0c4f4b9a7e0b20eaa8ac148371dc8b CMakeLists-fix-armhf.patch" sha256sums="d106f98a632ffc5cbc5e7482067d568db7687a2ffb078f97f528f9202f90a5a1 rspamd-1.4.2.tar.xz 6c5e79e9052d957f3d0d634b2ae7a56bbc0901a5d6946dc991c92f19a72fce97 rspamd.logrotated 5bcf68a72e0582859799cd335a14d48914e5291f4087327b3b42562ef64e2958 rspamd.initd fceba39a20755d48ef3838f7daa92ed9686a118c0a26f06bfe72cc7c15b2e384 rspamd.confd 7e0adb4a2e7e8f806fc5fdae0c37e6948ed56e9d46d4eed0c681806decb90e49 config.patch -d4bc7851bb32b49be98e3964aa9195033b586da27f7f3afa5ce12dfbeadd96b0 cmakelists.patch" +d4bc7851bb32b49be98e3964aa9195033b586da27f7f3afa5ce12dfbeadd96b0 cmakelists.patch +2cde427fcdc543fe85ce1a409a047dba3c53fd57d1f1d54fcdf86392d87209e0 CMakeLists-fix-armhf.patch" sha512sums="7a2c9c736d6612088eb8d48e313feec310c740263aa3a5e30b1ae88937ecf088de533589a8ef783e238fe3dc5e579592220bd86ea0e45672bd3fc06c52f96782 rspamd-1.4.2.tar.xz 2efe28575c40d1fba84b189bb872860e744400db80dce2f6330be6c6287fb3f46e6511284729b957488bf40bcb9b0952e26df9934f5f138334bd2766075c45cb rspamd.logrotated e240983c2fd91d8061b17e35e83a75c56ac2c3625dbe07b83a2e89e3dbf69b57c675d01772b93968aa6b22d150d54d366f2fb4a0c6551b3cfdedc77d82e28652 rspamd.initd 1320a752cbefe021079b3ed23e312231c39fc600baba7d8440c3e8bdd33ed673c8831b44a0c76788a8d905469e81088adf26cf245c09b4c2c4fdce7ff4219ee7 rspamd.confd 2089429e6f44f8204f31c87c565cdd7abcd51b3146397ba1b2fb23b1be6faf46fd8ec36718f194a3fc38ac1d38d7be9010a84ac4b49d7e1597706699538c607a config.patch -99593c10ffb04c71a4c83c7522b41f12465a9862283685bbc2fff464fd84fcf8b4bc4a892419d31332c01f805c69dd7730f537c60248b92fee35acdc6633a644 cmakelists.patch" +99593c10ffb04c71a4c83c7522b41f12465a9862283685bbc2fff464fd84fcf8b4bc4a892419d31332c01f805c69dd7730f537c60248b92fee35acdc6633a644 cmakelists.patch +bfdbefcff938f961c31852f7843b2e04ea8aa2bc0da0887b59b88d33e1f0ed9d38670e91be17157b70aafa70a65215878064c20eb9a16c223df44552b98d26fc CMakeLists-fix-armhf.patch" diff --git a/testing/rspamd/CMakeLists-fix-armhf.patch b/testing/rspamd/CMakeLists-fix-armhf.patch new file mode 100644 index 0000000000..88b6a99c78 --- /dev/null +++ b/testing/rspamd/CMakeLists-fix-armhf.patch @@ -0,0 +1,53 @@ +From 0c7d5f32de56ee254c4b1abc63e7c3709afd1cb2 Mon Sep 17 00:00:00 2001 +From: Vsevolod Stakhov <vsevolod@highsecure.ru> +Date: Sat, 10 Dec 2016 13:21:24 +0000 +Subject: [PATCH] [Minor] Try to fix build on non x86 architectures + +--- + src/libcryptobox/CMakeLists.txt | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/libcryptobox/CMakeLists.txt b/src/libcryptobox/CMakeLists.txt +index 637bfde..0ca8a2f 100644 +--- a/src/libcryptobox/CMakeLists.txt ++++ b/src/libcryptobox/CMakeLists.txt +@@ -32,12 +32,12 @@ SET(ASM_CODE " + ") + ASM_OP(HAVE_DOLLARMACRO "dollar macro convention") + +-IF(NOT HAVE_SLASHMACRO AND NOT HAVE_DOLLARMACRO) +- MESSAGE(FATAL_ERROR "Your assembler cannot compile macros, please check your CMakeFiles/CMakeError.log") +-ENDIF() +- + # For now we support only x86_64 architecture with optimizations + IF("${ARCH}" STREQUAL "x86_64") ++ IF(NOT HAVE_SLASHMACRO AND NOT HAVE_DOLLARMACRO) ++ MESSAGE(FATAL_ERROR "Your assembler cannot compile macros, please check your CMakeFiles/CMakeError.log") ++ ENDIF() ++ + SET(ASM_CODE "vpaddq %ymm0, %ymm0, %ymm0") + ASM_OP(HAVE_AVX2 "avx2") + SET(ASM_CODE "vpaddq %xmm0, %xmm0, %xmm0") +From 4e5fae43635e824e1b48f10af0bea7dccee0412d Mon Sep 17 00:00:00 2001 +From: Vsevolod Stakhov <vsevolod@highsecure.ru> +Date: Sat, 10 Dec 2016 14:29:22 +0000 +Subject: [PATCH] [Minor] Leftover for i386 + +--- + src/libcryptobox/CMakeLists.txt | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/libcryptobox/CMakeLists.txt b/src/libcryptobox/CMakeLists.txt +index 0ca8a2f..aef9c9d 100644 +--- a/src/libcryptobox/CMakeLists.txt ++++ b/src/libcryptobox/CMakeLists.txt +@@ -61,6 +61,9 @@ IF("${ARCH}" STREQUAL "x86_64") + + SET(BLAKE2SRC ${BLAKE2SRC} ${CMAKE_CURRENT_SOURCE_DIR}/blake2/x86-64.S) + ELSEIF("${ARCH}" STREQUAL "i386") ++ IF(NOT HAVE_SLASHMACRO AND NOT HAVE_DOLLARMACRO) ++ MESSAGE(FATAL_ERROR "Your assembler cannot compile macros, please check your CMakeFiles/CMakeError.log") ++ ENDIF() + SET(POLYSRC ${POLYSRC} ${CMAKE_CURRENT_SOURCE_DIR}/poly1305/ref-32.c) + SET(CURVESRC ${CURVESRC} ${CMAKE_CURRENT_SOURCE_DIR}/curve25519/curve25519-donna.c) + SET(BLAKE2SRC ${BLAKE2SRC} ${CMAKE_CURRENT_SOURCE_DIR}/blake2/x86-32.S) |