sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

graphics/exiv2: fix build on ARM and PPC platforms

Browse source 
exiv2 added -fcf-protection, which is not supported on either ARM or PPC.
1ea63ccb34 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)
This commit is contained in:
Piotr Kubaj 2020-07-09 11:53:22 +00:00
parent 6ac3df6a6a
commit 73cc729afe
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=541745
2 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
graphics/exiv2/Makefile
View file

@ -17,9 +17,10 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libexpat.so:textproc/expat2 LIB_DEPENDS= libexpat.so:textproc/expat2
TEST_DEPENDS= bash:shells/bash 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 python:3.5+,test localbase:ldflags
USE_LDCONFIG= yes USE_LDCONFIG= yes
DOS2UNIX_FILES= cmake/compilerFlags.cmake
TEST_TARGET= tests TEST_TARGET= tests

15
graphics/exiv2/files/patch-cmake_compilerFlags.cmake Normal file
View file

@ -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