Date: Thu, 9 Jul 2020 11:54:38 +0000 (UTC) From: Piotr Kubaj <pkubaj@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r541746 - in branches/2020Q3/graphics/exiv2: . files Message-ID: <202007091154.069BscM1007934@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pkubaj Date: Thu Jul 9 11:54:38 2020 New Revision: 541746 URL: https://svnweb.freebsd.org/changeset/ports/541746 Log: MFH: r541745 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. Approved by: portmgr (fix build blanket) Added: branches/2020Q3/graphics/exiv2/files/patch-cmake_compilerFlags.cmake - copied unchanged from r541745, head/graphics/exiv2/files/patch-cmake_compilerFlags.cmake Modified: branches/2020Q3/graphics/exiv2/Makefile Directory Properties: branches/2020Q3/ (props changed) Modified: branches/2020Q3/graphics/exiv2/Makefile ============================================================================== --- branches/2020Q3/graphics/exiv2/Makefile Thu Jul 9 11:53:22 2020 (r541745) +++ branches/2020Q3/graphics/exiv2/Makefile Thu Jul 9 11:54:38 2020 (r541746) @@ -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 Copied: branches/2020Q3/graphics/exiv2/files/patch-cmake_compilerFlags.cmake (from r541745, head/graphics/exiv2/files/patch-cmake_compilerFlags.cmake) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q3/graphics/exiv2/files/patch-cmake_compilerFlags.cmake Thu Jul 9 11:54:38 2020 (r541746, copy of r541745, head/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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202007091154.069BscM1007934>