From f34d3c80b1e623eac5f481d83a377c2c76a37411 Mon Sep 17 00:00:00 2001 From: Koichiro IWAO Date: Mon, 16 Mar 2020 18:21:40 +0900 Subject: [PATCH 1/2] allow to SKIP_CPU_FEATURES explicitly, not only autodetect Formerly, SKIP_CPU_FEATURES is automatically detected by system processor. However, "^(armv7l|aarch64|s390x)$" does not cover all processors that cpu_features should be skipped. "armv6", "armv7", "mips", "mips64" on FreeBSD are examples [1] that cpu_features is not correctly skipped. This change intends to build SoftEther without any modifications on CMakeLists.txt on such processors. cmake . -DSKIP_CPU_FEATURES=1 [1] https://www.freebsd.org/platforms/ --- src/Mayaqua/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Mayaqua/CMakeLists.txt b/src/Mayaqua/CMakeLists.txt index b4a536c3..01eeb303 100644 --- a/src/Mayaqua/CMakeLists.txt +++ b/src/Mayaqua/CMakeLists.txt @@ -65,7 +65,7 @@ if(UNIX) target_link_libraries(mayaqua PRIVATE OpenSSL::SSL OpenSSL::Crypto Threads::Threads ZLIB::ZLIB) - if (CMAKE_SYSTEM_PROCESSOR MATCHES "^(armv7l|aarch64|s390x)$" OR NOT HAVE_SYS_AUXV) + if (CMAKE_SYSTEM_PROCESSOR MATCHES "^(armv7l|aarch64|s390x)$" OR NOT HAVE_SYS_AUXV OR SKIP_CPU_FEATURES) add_definitions(-DSKIP_CPU_FEATURES) else() add_subdirectory(3rdparty/cpu_features) From 1e601ebf6595e8c663830c707c0fd0b96be77c46 Mon Sep 17 00:00:00 2001 From: Koichiro IWAO Date: Mon, 16 Mar 2020 19:03:37 +0900 Subject: [PATCH 2/2] FreeBSD CI: quit CI test with "openssl111" It is scheduled to be removed on or after 2020-03-31. "openssl" is now updated to 1.1.1 and it alternates "openssl111" now. --- .cirrus.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index acb95156..b32063db 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -2,13 +2,12 @@ FreeBSD_task: matrix: env: SSL: openssl - env: - SSL: openssl111 env: SSL: libressl env: SSL: libressl-devel env: + # base openssl SSL: matrix: freebsd_instance: