Date: Fri, 29 May 2015 21:32:44 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r387893 - head/textproc/kenlm/files Message-ID: <201505292132.t4TLWiZe010981@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dim (src committer) Date: Fri May 29 21:32:43 2015 New Revision: 387893 URL: https://svnweb.freebsd.org/changeset/ports/387893 Log: In PR200475, it turned out textproc/kenlm is using "CC" to do a sanity check at bootstrap time. Make it use ${CXX} instead. Approved by: demon (maintainer) PR: 200475, 200527 Modified: head/textproc/kenlm/files/patch-jam-files-sanity.jam Modified: head/textproc/kenlm/files/patch-jam-files-sanity.jam ============================================================================== --- head/textproc/kenlm/files/patch-jam-files-sanity.jam Fri May 29 21:31:06 2015 (r387892) +++ head/textproc/kenlm/files/patch-jam-files-sanity.jam Fri May 29 21:32:43 2015 (r387893) @@ -1,11 +1,19 @@ --- jam-files/sanity.jam.orig 2014-04-21 07:58:19.000000000 +0400 +++ jam-files/sanity.jam 2014-08-31 00:16:40.000000000 +0400 -@@ -148,7 +148,7 @@ rule boost-lib ( name macro : deps * ) { +@@ -22,6 +22,7 @@ rule shell_or_fail ( cmd ) { + } + } + ++cxx = [ os.environ "CXX" ] ; + cxxflags = [ os.environ "CXXFLAGS" ] ; + cflags = [ os.environ "CFLAGS" ] ; + ldflags = [ os.environ "LDFLAGS" ] ; +@@ -148,7 +149,7 @@ rule boost-lib ( name macro : deps * ) { #Argument is e.g. 103600 rule boost ( min-version ) { - local cmd = "bash -c \"g++ "$(I-boost-include)" -dM -x c++ -E /dev/null -include boost/version.hpp 2>/dev/null |grep '#define BOOST_'\"" ; -+ local cmd = "bash -c \"CC "$(I-boost-include)" -dM -x c++ -E /dev/null -include boost/version.hpp 2>/dev/null |grep '#define BOOST_'\"" ; ++ local cmd = "bash -c \"$(cxx) "$(I-boost-include)" -dM -x c++ -E /dev/null -include boost/version.hpp 2>/dev/null |grep '#define BOOST_'\"" ; local boost-shell = [ SHELL "$(cmd)" : exit-status ] ; if $(boost-shell[2]) != 0 && $(CLEANING) = no { echo Failed to run "$(cmd)" ;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201505292132.t4TLWiZe010981>