diff options
-rw-r--r-- | meta-oe/recipes-support/exiv2/exiv2/0001-Use-compiler-fcf-protection-only-if-compiler-arch-su.patch | 40 | ||||
-rw-r--r-- | meta-oe/recipes-support/exiv2/exiv2_0.27.3.bb (renamed from meta-oe/recipes-support/exiv2/exiv2_0.27.1.bb) | 7 |
2 files changed, 45 insertions, 2 deletions
diff --git a/meta-oe/recipes-support/exiv2/exiv2/0001-Use-compiler-fcf-protection-only-if-compiler-arch-su.patch b/meta-oe/recipes-support/exiv2/exiv2/0001-Use-compiler-fcf-protection-only-if-compiler-arch-su.patch new file mode 100644 index 0000000000..96146a1957 --- /dev/null +++ b/meta-oe/recipes-support/exiv2/exiv2/0001-Use-compiler-fcf-protection-only-if-compiler-arch-su.patch @@ -0,0 +1,40 @@ +From 04d5f4805a86302a0e135a28d58a6c1ff6a68d52 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Thu, 30 Jul 2020 23:03:51 +0200 +Subject: [PATCH] Use compiler -fcf-protection only if compiler/arch supports + it +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +There have been some PRs they were either rejected or some general suggestion +for more flags suggested. So + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + cmake/compilerFlags.cmake | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/cmake/compilerFlags.cmake b/cmake/compilerFlags.cmake +index 12caf42..455525e 100644 +--- a/cmake/compilerFlags.cmake ++++ b/cmake/compilerFlags.cmake +@@ -26,7 +26,12 @@ if ( MINGW OR UNIX OR MSYS ) # MINGW, Linux, APPLE, CYGWIN + # This fails under Fedora, MinGW GCC 8.3.0 and CYGWIN/MSYS 9.3.0 + if (NOT (MINGW OR CMAKE_HOST_SOLARIS OR CYGWIN OR MSYS) ) + if (COMPILER_IS_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 8.0) +- add_compile_options(-fstack-clash-protection -fcf-protection) ++ # Gcc does support -fcf-protection on few arches only ++ CHECK_CXX_COMPILER_FLAG(-fcf-protection COMPILER_SUPPORTS_FCF_PROTECTION) ++ if (COMPILER_SUPPORTS_FCF_PROTECTION) ++ add_compile_options(-fcf-protection) ++ endif() ++ add_compile_options(-fstack-clash-protection) + endif() + + if( (COMPILER_IS_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 5.0) # Not in GCC 4.8 +-- +2.21.3 + diff --git a/meta-oe/recipes-support/exiv2/exiv2_0.27.1.bb b/meta-oe/recipes-support/exiv2/exiv2_0.27.3.bb index 97116ee2d1..ed1e8de5c2 100644 --- a/meta-oe/recipes-support/exiv2/exiv2_0.27.1.bb +++ b/meta-oe/recipes-support/exiv2/exiv2_0.27.3.bb @@ -5,8 +5,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=625f055f41728f84a8d7938acc35bdc2" DEPENDS = "zlib expat" SRC_URI = "https://exiv2.org/releases/${BPN}-${PV}-Source.tar.gz" -SRC_URI[md5sum] = "56d064517ae5903dd963b84514a121c1" -SRC_URI[sha256sum] = "f125286980fd1bcb28e188c02a93946951c61e10784720be2301b661a65b3081" +SRC_URI[sha256sum] = "a79f5613812aa21755d578a297874fb59a85101e793edc64ec2c6bd994e3e778" + +# Once patch is obsolete (project should be aware due to PRs), dos2unix can be removed either +inherit dos2unix +SRC_URI += "file://0001-Use-compiler-fcf-protection-only-if-compiler-arch-su.patch" S = "${WORKDIR}/${BPN}-${PV}-Source" |