From owner-svn-ports-all@freebsd.org Mon Aug 17 23:55:04 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 8A8693BE964; Mon, 17 Aug 2020 23:55:04 +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 4BVrWX39Z8z4QGt; Mon, 17 Aug 2020 23:55:04 +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 4BF6B8777; Mon, 17 Aug 2020 23:55:04 +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 07HNt4rW068388; Mon, 17 Aug 2020 23:55:04 GMT (envelope-from pkubaj@FreeBSD.org) Received: (from pkubaj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07HNt3qx068387; Mon, 17 Aug 2020 23:55:03 GMT (envelope-from pkubaj@FreeBSD.org) Message-Id: <202008172355.07HNt3qx068387@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to pkubaj@FreeBSD.org using -f From: Piotr Kubaj Date: Mon, 17 Aug 2020 23:55:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r545197 - in head/math/cadical: . files X-SVN-Group: ports-head X-SVN-Commit-Author: pkubaj X-SVN-Commit-Paths: in head/math/cadical: . files X-SVN-Commit-Revision: 545197 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: Mon, 17 Aug 2020 23:55:04 -0000 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 +