<div dir="ltr"><div>Hi,<br></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Mon, Apr 6, 2020 at 12:38 AM Rosen Penev <<a href="mailto:rosenp@gmail.com">rosenp@gmail.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Remove libressl patches. They are no longer needed.<br></blockquote><div>Can you add why they're not needed anymore ?</div><div><br></div><div>Thx</div><div>Hans<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
<br>
Replace qt tests patch with one that disables all of them.<br>
<br>
Refresh remaining one.<br>
<br>
Signed-off-by: Rosen Penev <<a href="mailto:rosenp@gmail.com" target="_blank">rosenp@gmail.com</a>><br>
---<br>
tools/cmake/Makefile | 6 ++--<br>
.../cmake/patches/100-disable_qt_tests.patch | 34 -------------------<br>
tools/cmake/patches/100-no-testing.patch | 33 ++++++++++++++++++<br>
.../110-libarchive-fix-libressl-compat.patch | 11 ------<br>
.../130-bootstrap_parallel_make_flag.patch | 2 +-<br>
.../patches/140-libarchive-fix-libressl.patch | 25 --------------<br>
6 files changed, 37 insertions(+), 74 deletions(-)<br>
delete mode 100644 tools/cmake/patches/100-disable_qt_tests.patch<br>
create mode 100644 tools/cmake/patches/100-no-testing.patch<br>
delete mode 100644 tools/cmake/patches/110-libarchive-fix-libressl-compat.patch<br>
delete mode 100644 tools/cmake/patches/140-libarchive-fix-libressl.patch<br>
<br>
diff --git a/tools/cmake/Makefile b/tools/cmake/Makefile<br>
index 336db5dd1f..ab3d225aa6 100644<br>
--- a/tools/cmake/Makefile<br>
+++ b/tools/cmake/Makefile<br>
@@ -7,13 +7,13 @@<br>
include $(TOPDIR)/<a href="http://rules.mk" rel="noreferrer" target="_blank">rules.mk</a><br>
<br>
PKG_NAME:=cmake<br>
-PKG_VERSION:=3.16.5<br>
+PKG_VERSION:=3.17.0<br>
PKG_CPE_ID:=cpe:/a:kitware:cmake<br>
<br>
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz<br>
PKG_SOURCE_URL:=<a href="https://github.com/Kitware/CMake/releases/download/v$(PKG_VERSION)/" rel="noreferrer" target="_blank">https://github.com/Kitware/CMake/releases/download/v$(PKG_VERSION)/</a> \<br>
- <a href="https://cmake.org/files/v3.16/" rel="noreferrer" target="_blank">https://cmake.org/files/v3.16/</a><br>
-PKG_HASH:=5f760b50b8ecc9c0c37135fae5fbf00a2fef617059aa9d61c1bb91653e5a8bfc<br>
+ <a href="https://cmake.org/files/v3.17/" rel="noreferrer" target="_blank">https://cmake.org/files/v3.17/</a><br>
+PKG_HASH:=b74c05b55115eacc4fa2b77a814981dbda05cdc95a53e279fe16b7b272f00847<br>
<br>
HOST_BUILD_PARALLEL:=1<br>
HOST_CONFIGURE_PARALLEL:=1<br>
diff --git a/tools/cmake/patches/100-disable_qt_tests.patch b/tools/cmake/patches/100-disable_qt_tests.patch<br>
deleted file mode 100644<br>
index 9c0957a390..0000000000<br>
--- a/tools/cmake/patches/100-disable_qt_tests.patch<br>
+++ /dev/null<br>
@@ -1,34 +0,0 @@<br>
---- a/Tests/RunCMake/CMakeLists.txt<br>
-+++ b/Tests/RunCMake/CMakeLists.txt<br>
-@@ -375,15 +375,6 @@ else()<br>
- message(WARNING "Could not find or build ctresalloc")<br>
- endif()<br>
- <br>
--find_package(Qt4 QUIET)<br>
--find_package(Qt5Core QUIET)<br>
--if (QT4_FOUND AND Qt5Core_FOUND AND NOT Qt5Core_VERSION VERSION_LESS 5.1.0)<br>
-- add_RunCMake_test(IncompatibleQt)<br>
--endif()<br>
--if (QT4_FOUND)<br>
-- add_RunCMake_test(ObsoleteQtMacros -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE})<br>
--endif()<br>
--<br>
- find_package(PkgConfig QUIET)<br>
- if(PKG_CONFIG_FOUND)<br>
- add_RunCMake_test(FindPkgConfig)<br>
---- a/Tests/CMakeLists.txt<br>
-+++ b/Tests/CMakeLists.txt<br>
-@@ -489,13 +489,6 @@ if(BUILD_TESTING)<br>
- <br>
- list(APPEND TEST_BUILD_DIRS ${CMake_TEST_INSTALL_PREFIX})<br>
- <br>
-- if(NOT DEFINED CMake_TEST_Qt4)<br>
-- set(CMake_TEST_Qt4 1)<br>
-- endif()<br>
-- if(CMake_TEST_Qt4 AND NOT QT4_FOUND)<br>
-- find_package(Qt4 QUIET)<br>
-- endif()<br>
--<br>
- if(CMake_TEST_Qt4 AND QT4_FOUND)<br>
- # test whether the Qt4 which has been found works, on some machines<br>
- # which run nightly builds there were errors like "wrong file format"<br>
diff --git a/tools/cmake/patches/100-no-testing.patch b/tools/cmake/patches/100-no-testing.patch<br>
new file mode 100644<br>
index 0000000000..501302b835<br>
--- /dev/null<br>
+++ b/tools/cmake/patches/100-no-testing.patch<br>
@@ -0,0 +1,33 @@<br>
+--- a/Modules/CTest.cmake<br>
++++ b/Modules/CTest.cmake<br>
+@@ -47,7 +47,7 @@ the :variable:`CTEST_USE_LAUNCHERS` variable::<br>
+ in the ``CTestConfig.cmake`` file.<br>
+ #]=======================================================================]<br>
+ <br>
+-option(BUILD_TESTING "Build the testing tree." ON)<br>
++option(BUILD_TESTING "Build the testing tree." OFF)<br>
+ <br>
+ # function to turn generator name into a version string<br>
+ # like vs9 or vs10<br>
+--- a/Modules/Dart.cmake<br>
++++ b/Modules/Dart.cmake<br>
+@@ -33,7 +33,7 @@ whether testing support should be enabled. The default is ON.<br>
+ #<br>
+ #<br>
+ <br>
+-option(BUILD_TESTING "Build the testing tree." ON)<br>
++option(BUILD_TESTING "Build the testing tree." OFF)<br>
+ <br>
+ if(BUILD_TESTING)<br>
+ find_package(Dart QUIET)<br>
+--- a/Tests/Contracts/VTK/<a href="http://Dashboard.cmake.in" rel="noreferrer" target="_blank">Dashboard.cmake.in</a><br>
++++ b/Tests/Contracts/VTK/<a href="http://Dashboard.cmake.in" rel="noreferrer" target="_blank">Dashboard.cmake.in</a><br>
+@@ -25,7 +25,7 @@ ctest_empty_binary_directory(${CTEST_BINARY_DIRECTORY})<br>
+ <br>
+ file(WRITE "${CTEST_BINARY_DIRECTORY}/CMakeCache.txt" "<br>
+ BUILD_EXAMPLES:BOOL=ON<br>
+- BUILD_TESTING:BOOL=ON<br>
++ BUILD_TESTING:BOOL=OFF<br>
+ VTK_WRAP_PYTHON:BOOL=ON<br>
+ ExternalData_OBJECT_STORES:FILEPATH=@base_dir@/ExternalData<br>
+ ")<br>
diff --git a/tools/cmake/patches/110-libarchive-fix-libressl-compat.patch b/tools/cmake/patches/110-libarchive-fix-libressl-compat.patch<br>
deleted file mode 100644<br>
index ba6565b6af..0000000000<br>
--- a/tools/cmake/patches/110-libarchive-fix-libressl-compat.patch<br>
+++ /dev/null<br>
@@ -1,11 +0,0 @@<br>
---- a/Utilities/cmlibarchive/libarchive/archive_openssl_evp_private.h<br>
-+++ b/Utilities/cmlibarchive/libarchive/archive_openssl_evp_private.h<br>
-@@ -28,7 +28,7 @@<br>
- #include <openssl/evp.h><br>
- #include <openssl/opensslv.h><br>
- <br>
--#if OPENSSL_VERSION_NUMBER < 0x10100000L<br>
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)<br>
- #include <stdlib.h> /* malloc, free */<br>
- #include <string.h> /* memset */<br>
- static inline EVP_MD_CTX *EVP_MD_CTX_new(void)<br>
diff --git a/tools/cmake/patches/130-bootstrap_parallel_make_flag.patch b/tools/cmake/patches/130-bootstrap_parallel_make_flag.patch<br>
index 9fcbf63f98..7b6198b14b 100644<br>
--- a/tools/cmake/patches/130-bootstrap_parallel_make_flag.patch<br>
+++ b/tools/cmake/patches/130-bootstrap_parallel_make_flag.patch<br>
@@ -1,6 +1,6 @@<br>
--- a/bootstrap<br>
+++ b/bootstrap<br>
-@@ -1248,7 +1248,10 @@ int main(){ printf("1%c", (char)0x0a); r<br>
+@@ -1283,7 +1283,10 @@ int main(){ printf("1%c", (char)0x0a); r<br>
' > "test.c"<br>
cmake_original_make_flags="${cmake_make_flags}"<br>
if [ "x${cmake_parallel_make}" != "x" ]; then<br>
diff --git a/tools/cmake/patches/140-libarchive-fix-libressl.patch b/tools/cmake/patches/140-libarchive-fix-libressl.patch<br>
deleted file mode 100644<br>
index ddddc5e836..0000000000<br>
--- a/tools/cmake/patches/140-libarchive-fix-libressl.patch<br>
+++ /dev/null<br>
@@ -1,25 +0,0 @@<br>
-From 5da00ad75b09e262774ec3675bbe4d5a4502a852 Mon Sep 17 00:00:00 2001<br>
-From: Bernard Spil <brnrd@FreeBSD.org><br>
-Date: Sun, 1 Apr 2018 23:01:44 +0200<br>
-Subject: [PATCH] fix build with LibreSSL 2.7<br>
-<br>
-LibreSSL 2.7 adds OpenSSL 1.1 API leading to conflicts on method names<br>
-<br>
-See also: <a href="https://bugs.freebsd.org/226853" rel="noreferrer" target="_blank">https://bugs.freebsd.org/226853</a><br>
-Signed-off-by: Bernard Spil <brnrd@FreeBSD.org><br>
----<br>
- libarchive/archive_openssl_hmac_private.h | 3 ++-<br>
- 1 file changed, 2 insertions(+), 1 deletion(-)<br>
-<br>
---- a/Utilities/cmlibarchive/libarchive/archive_openssl_evp_private.h<br>
-+++ b/Utilities/cmlibarchive/libarchive/archive_openssl_evp_private.h<br>
-@@ -28,7 +28,8 @@<br>
- #include <openssl/evp.h><br>
- #include <openssl/opensslv.h><br>
- <br>
--#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)<br>
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \<br>
-+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)<br>
- #include <stdlib.h> /* malloc, free */<br>
- #include <string.h> /* memset */<br>
- static inline EVP_MD_CTX *EVP_MD_CTX_new(void)<br>
-- <br>
2.25.1<br>
<br>
<br>
_______________________________________________<br>
openwrt-devel mailing list<br>
<a href="mailto:openwrt-devel@lists.openwrt.org" target="_blank">openwrt-devel@lists.openwrt.org</a><br>
<a href="https://lists.openwrt.org/mailman/listinfo/openwrt-devel" rel="noreferrer" target="_blank">https://lists.openwrt.org/mailman/listinfo/openwrt-devel</a><br>
</blockquote></div></div>