svn commit: r545198 - in branches/2020Q3/math/cadical: . files

[Piotr Kubaj]

Author: pkubaj
Date: Mon Aug 17 23:55:56 2020
New Revision: 545198
URL: https://svnweb.freebsd.org/changeset/ports/545198

Log:
  MFH: r545197
  
  math/cadical: fix build on GCC architectures
  
  Use | instead of , in the sed command to workaround for -Wl,rpath in CXXFLAGS.
  
  Approved by:	portmgr (fix build blanket)

Modified:
  branches/2020Q3/math/cadical/Makefile
  branches/2020Q3/math/cadical/files/patch-configure
Directory Properties:
  branches/2020Q3/   (props changed)

Modified: branches/2020Q3/math/cadical/Makefile
==============================================================================
--- branches/2020Q3/math/cadical/Makefile	Mon Aug 17 23:55:03 2020	(r545197)
+++ branches/2020Q3/math/cadical/Makefile	Mon Aug 17 23:55:56 2020	(r545198)
@@ -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, at CXXFLAGS@,-O2 -pipe  ...": bad flag in substitute command: '-'
-
 USES=		compiler:c++0x gmake tar:xz
 GNU_CONFIGURE=	yes
 

Modified: branches/2020Q3/math/cadical/files/patch-configure
==============================================================================
--- branches/2020Q3/math/cadical/files/patch-configure	Mon Aug 17 23:55:03 2020	(r545197)
+++ branches/2020Q3/math/cadical/files/patch-configure	Mon Aug 17 23:55:56 2020	(r545198)
@@ -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, at CXX@,$CXX," \
+--e "s, at CXXFLAGS@,$CXXFLAGS," \
++-e "s|@CXXFLAGS@|$CXXFLAGS|" \
+ -e "s, at MAKEFLAGS@,$MAKEFLAGS," \
+ ../makefile.in > makefile
+