diff options
| author | Piotr Kubaj <pkubaj@FreeBSD.org> | 2020-07-09 19:53:22 +0800 |
|---|---|---|
| committer | Piotr Kubaj <pkubaj@FreeBSD.org> | 2020-07-09 19:53:22 +0800 |
| commit | 73cc729afe03cbf9264fb4700542efa680bb0ee3 (patch) | |
| tree | 7da17f86847ca45c2eb4691510e41bb1f695c644 /graphics | |
| parent | 6ac3df6a6a2a82df8d8598e14159aebb92ab8238 (diff) | |
| download | freebsd-ports-gnome-73cc729afe03cbf9264fb4700542efa680bb0ee3.tar.gz freebsd-ports-gnome-73cc729afe03cbf9264fb4700542efa680bb0ee3.tar.zst freebsd-ports-gnome-73cc729afe03cbf9264fb4700542efa680bb0ee3.zip | |
graphics/exiv2: fix build on ARM and PPC platforms
exiv2 added -fcf-protection, which is not supported on either ARM or PPC.
https://github.com/Exiv2/exiv2/commit/1ea63ccb345a4498b41cb8842622ba7ecc9fd484 fixes that but only for ARM.
Merge this commit and add modify it to also fix PPC. This is likely the wrong approach, since -fcf-protection seems to be available only on amd64, but this is the approach that upstream chose.
MFH: 2020Q3 (fix build blanket)
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/exiv2/Makefile | 3 | ||||
| -rw-r--r-- | graphics/exiv2/files/patch-cmake_compilerFlags.cmake | 15 |
2 files changed, 17 insertions, 1 deletions
diff --git a/graphics/exiv2/Makefile b/graphics/exiv2/Makefile index c196f788b94e..d7aa5d7869fb 100644 --- a/graphics/exiv2/Makefile +++ b/graphics/exiv2/Makefile @@ -17,9 +17,10 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libexpat.so:textproc/expat2 TEST_DEPENDS= bash:shells/bash -USES= cmake compiler:c++11-lang cpe gettext iconv pathfix \ +USES= cmake compiler:c++11-lang cpe dos2unix gettext iconv pathfix \ python:3.5+,test localbase:ldflags USE_LDCONFIG= yes +DOS2UNIX_FILES= cmake/compilerFlags.cmake TEST_TARGET= tests diff --git a/graphics/exiv2/files/patch-cmake_compilerFlags.cmake b/graphics/exiv2/files/patch-cmake_compilerFlags.cmake new file mode 100644 index 000000000000..f7822207c73e --- /dev/null +++ b/graphics/exiv2/files/patch-cmake_compilerFlags.cmake @@ -0,0 +1,15 @@ +--- cmake/compilerFlags.cmake.orig 2020-07-09 11:24:28 UTC ++++ cmake/compilerFlags.cmake +@@ -26,7 +26,11 @@ if ( MINGW OR UNIX OR MSYS ) # MINGW, Linux, APPLE, CY + # 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) ++ if (NOT (${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm" OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "powerpc")) ++ add_compile_options(-fstack-clash-protection -fcf-protection) ++ else() ++ add_compile_options(-fstack-clash-protection) ++ endif() + endif() + + if( (COMPILER_IS_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 5.0) # Not in GCC 4.8 |