Skip to contentSkip to conversation

package/exiv2: fix compiler flags detection

PATCH New Thomas Petazzoni 2 participants 3 messages Jul 19, 2020 – Jul 20, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/exiv2: fix compiler flags detection

Add a patch, which has been submitted upstream, to properly detect the availability of compiler flags before using them.

This will fix the build of exiv2 on CPU architectures for which gcc doesn't implement -fcf-protection.

Fixes:

http://autobuild.buildroot.net/results/ef6a6fa2309e66a7a36fface626ae0da1a7ec633/
(and many similar build failures on other architectures)

---
 ...ags.cmake-properly-detect-availabili.patch | 58 +++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 package/exiv2/0001-cmake-compilerFlags.cmake-properly-detect-availabili.patch
package/exiv2/0001-cmake-compilerFlags.cmake-properly-detect-availabili.patch new file +58 -0
new file mode 100644
index 0000000000..6302d4cfcf
@@ -0,0 +1,58 @@
+From 2f6d2e5795382f0d6e22f5aea52e8104110d24ad Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <[email protected]>
+Date: Sun, 19 Jul 2020 16:29:15 +0200
+Subject: [PATCH] cmake/compilerFlags.cmake: properly detect availability of
+ flags
+
+Instead of relying on fragile and complex logic to decide if a
+compiler flag is available or not, use the check_c_compiler_flag()
+macro provided by the CMake standard library.
+
+This for example avoids using -fcf-protection on architectures that
+don't support this option.
+
+[Upstream: https://github.com/Exiv2/exiv2/pull/1252. The submitted
+patch is slightly different than this one, due to other changes
+between 0.27.3 and master.]
+Signed-off-by: Thomas Petazzoni <[email protected]>
+---
+ cmake/compilerFlags.cmake | 18 +++++++++++-------
+ 1 file changed, 11 insertions(+), 7 deletions(-)
+
+diff --git a/cmake/compilerFlags.cmake b/cmake/compilerFlags.cmake
+index 0418aa61..be430977 100644
+--- a/cmake/compilerFlags.cmake
++++ b/cmake/compilerFlags.cmake
+@@ -1,4 +1,5 @@
+ # These flags applies to exiv2lib, the applications, and to the xmp code
++include(CheckCCompilerFlag)
+ 
+ if ( MINGW OR UNIX OR MSYS ) # MINGW, Linux, APPLE, CYGWIN
+     if (${CMAKE_CXX_COMPILER_ID} STREQUAL GNU)
+@@ -25,13 +26,16 @@ 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)
+-            endif()
+-
+-            if( (COMPILER_IS_GCC   AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 5.0) # Not in GCC 4.8
+-            OR  (COMPILER_IS_CLANG AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 3.7) # Not in Clang 3.4.2
+-            )
++	    check_c_compiler_flag(-fstack-clash-protection HAS_FSTACK_CLASH_PROTECTION)
++	    check_c_compiler_flag(-fcf-protection HAS_FCF_PROTECTION)
++	    check_c_compiler_flag(-fstack-protector-strong HAS_FSTACK_PROTECTOR_STRONG)
++	    if(HAS_FSTACK_CLASH_PROTECTION)
++                add_compile_options(-fstack-clash-protection)
++	    endif()
++	    if(GCC_HAS_FCF_PROTECTION)
++		add_compile_options(-fcf-protection)
++	    endif()
++	    if(GCC_HAS_FSTACK_PROTECTOR_STRONG)
+                 add_compile_options(-fstack-protector-strong)
+             endif()
+         endif()
+-- 
+2.26.2
+
Signature · 1 line
2.26.2
#1 lore raw

PATCH 1/1 package/exiv2: fix compiler flags detection

Thomas, All,

On 2020-07-19 16:34 +0200, Thomas Petazzoni spake thusly:

Quoted 24 lines

Add a patch, which has been submitted upstream, to properly detect the availability of compiler flags before using them.

This will fix the build of exiv2 on CPU architectures for which gcc doesn't implement -fcf-protection.
+--- a/cmake/compilerFlags.cmake
++++ b/cmake/compilerFlags.cmake
+@@ -1,4 +1,5 @@
+ # These flags applies to exiv2lib, the applications, and to the xmp code ++include(CheckCCompilerFlag)
+
+ if ( MINGW OR UNIX OR MSYS ) # MINGW, Linux, APPLE, CYGWIN

package/exiv2/0001-cmake-compilerFlags.cmake-properly-detect-availabili.patch new file +12 -0
+     if (${CMAKE_CXX_COMPILER_ID} STREQUAL GNU)
+@@ -25,13 +26,16 @@ 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)
+-            endif()
+-
+-            if( (COMPILER_IS_GCC   AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 5.0) # Not in GCC 4.8
+-            OR  (COMPILER_IS_CLANG AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 3.7) # Not in Clang 3.4.2
+-            )

package/exiv2/0001-cmake-compilerFlags.cmake-properly-detect-availabili.patch line 52

Quoted 10 lines
package/exiv2/0001-cmake-compilerFlags.cmake-properly-detect-availabili.patch new file +10 -0
++	    check_c_compiler_flag(-fstack-clash-protection HAS_FSTACK_CLASH_PROTECTION)
++	    check_c_compiler_flag(-fcf-protection HAS_FCF_PROTECTION)
++	    check_c_compiler_flag(-fstack-protector-strong HAS_FSTACK_PROTECTOR_STRONG)
++	    if(HAS_FSTACK_CLASH_PROTECTION)
++                add_compile_options(-fstack-clash-protection)
++	    endif()
++	    if(GCC_HAS_FCF_PROTECTION)
++		add_compile_options(-fcf-protection)
++	    endif()
++	    if(GCC_HAS_FSTACK_PROTECTOR_STRONG)

You've used TABs in this file that otherwise uses spaces. Hence, indentation is off; I've "fixed" that.

Additionally, the file uses CRLF, so I had to also fix that (not your fault, patchowrk is picky about CRLF).

Applied to master with the two fixes, thanks.

Note also that he patch you sent upstream has the same TAB issue, causing incorrect rendering of the diff:

    https://github.com/Exiv2/exiv2/pull/1252/commits/4a76388f7f03e8ec73730292aa6866eda83df4e7

Regards,
Yann E. MORIN.

Quoted 13 lines
package/exiv2/0001-cmake-compilerFlags.cmake-properly-detect-availabili.patch new file +6 -0
+                 add_compile_options(-fstack-protector-strong)
+             endif()
+         endif()
+-- 
+2.26.2
+
Signature · 6 lines
2.26.2

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#2 lore raw

PATCH 1/1 package/exiv2: fix compiler flags detection

Quoted 2 lines · On Sun, 19 Jul 2020 18:17:21 +0200 "Yann E. MORIN" <[email protected]>…

You've used TABs in this file that otherwise uses spaces. Hence, indentation is off; I've "fixed" that.

Gah, stupid Emacs :-/

Quoted 2 lines

Additionally, the file uses CRLF, so I had to also fix that (not your fault, patchowrk is picky about CRLF).

Yes, I knew about CRLF, but I can't do much here, as you say, it's patchwork that messes up with CRLF line endings.

Quoted 3 lines

Note also that he patch you sent upstream has the same TAB issue, causing incorrect rendering of the diff:

    https://github.com/Exiv2/exiv2/pull/1252/commits/4a76388f7f03e8ec73730292aa6866eda83df4e7

It seems like anyway it is not going to be the variant that will be applied. The project maintainer is looking for help to resolve this issue more globally, but oh well it's not as if Buildroot wasn't keeping me busy enough already!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com