Date: Mon, 17 Aug 2020 23:55:03 +0000 (UTC) From: Piotr Kubaj <pkubaj@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r545197 - in head/math/cadical: . files Message-ID: <202008172355.07HNt3qx068387@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pkubaj Date: Mon Aug 17 23:55:03 2020 New Revision: 545197 URL: https://svnweb.freebsd.org/changeset/ports/545197 Log: math/cadical: fix build on GCC architectures Use | instead of , in the sed command to workaround for -Wl,rpath in CXXFLAGS. MFH: 2020Q3 (fix build blanket) Modified: head/math/cadical/Makefile head/math/cadical/files/patch-configure Modified: head/math/cadical/Makefile ============================================================================== --- head/math/cadical/Makefile Mon Aug 17 23:44:42 2020 (r545196) +++ head/math/cadical/Makefile Mon Aug 17 23:55:03 2020 (r545197) @@ -13,8 +13,6 @@ COMMENT= Simple CDCL satisfiability solver LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN_FreeBSD_12_powerpc64= fails to build: sed: 1: "s,@CXXFLAGS@,-O2 -pipe ...": bad flag in substitute command: '-' - USES= compiler:c++0x gmake tar:xz GNU_CONFIGURE= yes Modified: head/math/cadical/files/patch-configure ============================================================================== --- head/math/cadical/files/patch-configure Mon Aug 17 23:44:42 2020 (r545196) +++ head/math/cadical/files/patch-configure Mon Aug 17 23:55:03 2020 (r545197) @@ -1,4 +1,4 @@ ---- configure.orig 2019-12-04 05:29:57 UTC +--- configure.orig 2019-07-12 20:22:02 UTC +++ configure @@ -154,7 +154,7 @@ do CXXFLAGS="`expr \"$1\" : 'CXXFLAGS=\(.*\)'`" @@ -9,3 +9,12 @@ esac shift +@@ -396,7 +396,7 @@ sed \ + -e "2c\\ + # This 'makefile' is generated from '../makefile.in'." \ + -e "s,@CXX@,$CXX," \ +--e "s,@CXXFLAGS@,$CXXFLAGS," \ ++-e "s|@CXXFLAGS@|$CXXFLAGS|" \ + -e "s,@MAKEFLAGS@,$MAKEFLAGS," \ + ../makefile.in > makefile +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202008172355.07HNt3qx068387>