diff --git a/.checkpackageignore b/.checkpackageignore index 5d3d63d71f..704680c911 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -532,7 +532,6 @@ package/libcdaudio/0001-libcdaudio-enable-autoreconf.patch lib_patch.Upstream package/libcgi/0001-CMakeLists.txt-honour-BUILD_TESTING.patch lib_patch.Upstream package/libcgicc/0001-disable-documentation-option.patch lib_patch.Sob lib_patch.Upstream package/libconfuse/0001-Fix-163-unterminated-username-used-with-getpwnam.patch lib_patch.Upstream -package/libcorrect/0002-CMakeLists.txt-conditionally-use-fsanitize-address.patch lib_patch.Upstream package/libcuefile/0001-fix-static-link.patch lib_patch.Upstream package/libdaemon/0001-testd-use-unistd-h-instead-of-sys-unistd-h.patch lib_patch.Upstream package/libdnet/0001-python-makefile.patch lib_patch.Upstream diff --git a/package/libcorrect/0001-CMakeLists.txt-conditionally-use-Wpedantic.patch b/package/libcorrect/0001-CMakeLists.txt-conditionally-use-Wpedantic.patch deleted file mode 100644 index 77e29ad833..0000000000 --- a/package/libcorrect/0001-CMakeLists.txt-conditionally-use-Wpedantic.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 8fc28b4c4c01581b25220fdbc1eeda196e399256 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Wed, 10 Oct 2018 09:28:00 +0200 -Subject: [PATCH] CMakeLists.txt: conditionally use -Wpedantic - --Wpedantic is only provided by gcc >= 4.8. Since showing pedantic -warnings is not really mandatory, let's only use this option when the -compiler supports it. - -Signed-off-by: Thomas Petazzoni -Upstream: https://github.com/quiet/libcorrect/pull/25 ---- - CMakeLists.txt | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 193f311..e570198 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -3,13 +3,18 @@ project(Correct C) - include(CheckLibraryExists) - include(CheckIncludeFiles) - include(CheckCSourceCompiles) -+include(CheckCCompilerFlag) - - if(MSVC) - set(LIBM "") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W4") - else(MSVC) - set(LIBM "m") --set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC -std=c99 -Wpedantic -Wall") -+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC -std=c99 -Wall") -+check_c_compiler_flag(-Wpedantic COMPILER_SUPPORTS_WPEDANTIC) -+if(COMPILER_SUPPORTS_WPEDANTIC) -+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wpedantic") -+endif() - if(CMAKE_BUILD_TYPE STREQUAL "Debug") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g3 -O0 -fsanitize=address") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-no_pie,") --- -2.14.4 - diff --git a/package/libcorrect/0002-CMakeLists.txt-conditionally-use-fsanitize-address.patch b/package/libcorrect/0002-CMakeLists.txt-conditionally-use-fsanitize-address.patch index 82e4f13e66..dc0c18e063 100644 --- a/package/libcorrect/0002-CMakeLists.txt-conditionally-use-fsanitize-address.patch +++ b/package/libcorrect/0002-CMakeLists.txt-conditionally-use-fsanitize-address.patch @@ -8,6 +8,8 @@ Check that compiler supports -fsanitize=address before using it Fixes: - http://autobuild.buildroot.net/results/221d6a418e75b39fe645c3a56cee676518d2cff6 +Upstream: https://github.com/quiet/libcorrect/pull/26 + Signed-off-by: Fabrice Fontaine --- CMakeLists.txt | 6 +++++- diff --git a/package/libcorrect/libcorrect.hash b/package/libcorrect/libcorrect.hash index 4c6289fb82..0385abeb8c 100644 --- a/package/libcorrect/libcorrect.hash +++ b/package/libcorrect/libcorrect.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 79861750540fb3a1cc501ee217cb4d1febc4855f3fb82e5eb60906eec5379890 libcorrect-ce6c17f1f988765ae3695315d7cce1f2a2e6cf0d.tar.gz +sha256 5a4305aabe6c7d5b58f6677c41c54ad5e8d9003f7a5998f7344d93534e4c5760 libcorrect-f5a28c74fba7a99736fe49d3a5243eca29517ae9.tar.gz sha256 135138cd4304aa637836758dc5edfb5f21b7d09ecc637d25288d206b151a5768 LICENSE diff --git a/package/libcorrect/libcorrect.mk b/package/libcorrect/libcorrect.mk index 0a84aa5c26..9f2beb1d4a 100644 --- a/package/libcorrect/libcorrect.mk +++ b/package/libcorrect/libcorrect.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCORRECT_VERSION = ce6c17f1f988765ae3695315d7cce1f2a2e6cf0d +LIBCORRECT_VERSION = f5a28c74fba7a99736fe49d3a5243eca29517ae9 LIBCORRECT_SITE = $(call github,quiet,libcorrect,$(LIBCORRECT_VERSION)) LIBCORRECT_LICENSE = BSD-3-Clause LIBCORRECT_LICENSE_FILES = LICENSE