From owner-svn-ports-all@freebsd.org Thu Jul 9 11:53:23 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 21404367972; Thu, 9 Jul 2020 11:53:23 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4B2ZLq04dnz3fGb; Thu, 9 Jul 2020 11:53:23 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C002E1066E; Thu, 9 Jul 2020 11:53:22 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 069BrMLv007713; Thu, 9 Jul 2020 11:53:22 GMT (envelope-from pkubaj@FreeBSD.org) Received: (from pkubaj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 069BrMVQ007711; Thu, 9 Jul 2020 11:53:22 GMT (envelope-from pkubaj@FreeBSD.org) Message-Id: <202007091153.069BrMVQ007711@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to pkubaj@FreeBSD.org using -f From: Piotr Kubaj Date: Thu, 9 Jul 2020 11:53:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r541745 - in head/graphics/exiv2: . files X-SVN-Group: ports-head X-SVN-Commit-Author: pkubaj X-SVN-Commit-Paths: in head/graphics/exiv2: . files X-SVN-Commit-Revision: 541745 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Jul 2020 11:53:23 -0000 Author: pkubaj Date: Thu Jul 9 11:53:22 2020 New Revision: 541745 URL: https://svnweb.freebsd.org/changeset/ports/541745 Log: 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) Added: head/graphics/exiv2/files/patch-cmake_compilerFlags.cmake (contents, props changed) Modified: head/graphics/exiv2/Makefile Modified: head/graphics/exiv2/Makefile ============================================================================== --- head/graphics/exiv2/Makefile Thu Jul 9 11:36:36 2020 (r541744) +++ head/graphics/exiv2/Makefile Thu Jul 9 11:53:22 2020 (r541745) @@ -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 Added: head/graphics/exiv2/files/patch-cmake_compilerFlags.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/exiv2/files/patch-cmake_compilerFlags.cmake Thu Jul 9 11:53:22 2020 (r541745) @@ -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