From owner-svn-ports-all@freebsd.org Mon Mar 12 07:54:31 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 15087F51F02; Mon, 12 Mar 2018 07:54:31 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id AA95D6D818; Mon, 12 Mar 2018 07:54:30 +0000 (UTC) (envelope-from yuri@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 99042D53; Mon, 12 Mar 2018 07:54:30 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2C7sU42017903; Mon, 12 Mar 2018 07:54:30 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2C7sUmq017900; Mon, 12 Mar 2018 07:54:30 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <201803120754.w2C7sUmq017900@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Mon, 12 Mar 2018 07:54:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r464230 - in head/emulators/gem5: . files X-SVN-Group: ports-head X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: in head/emulators/gem5: . files X-SVN-Commit-Revision: 464230 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.25 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, 12 Mar 2018 07:54:31 -0000 Author: yuri Date: Mon Mar 12 07:54:30 2018 New Revision: 464230 URL: https://svnweb.freebsd.org/changeset/ports/464230 Log: emulators/gem5: Unbreak by fixing the python-config executable name PR: 226545 Submitted by: Neel Chauhan (maintainer) Modified: head/emulators/gem5/Makefile head/emulators/gem5/files/patch-SConstruct Modified: head/emulators/gem5/Makefile ============================================================================== --- head/emulators/gem5/Makefile Mon Mar 12 07:43:10 2018 (r464229) +++ head/emulators/gem5/Makefile Mon Mar 12 07:54:30 2018 (r464230) @@ -11,7 +11,6 @@ COMMENT= gem5 Simulator System BUILD_DEPENDS= swig3.0:devel/swig30 \ scons:devel/scons -BROKEN= fails to build BROKEN_armv6= fails to link: undefined reference to HDLcd::BUS_OPTIONS_RESETV BROKEN_armv7= fails to link: undefined reference to HDLcd::BUS_OPTIONS_RESETV BROKEN_i386= does not build Modified: head/emulators/gem5/files/patch-SConstruct ============================================================================== --- head/emulators/gem5/files/patch-SConstruct Mon Mar 12 07:43:10 2018 (r464229) +++ head/emulators/gem5/files/patch-SConstruct Mon Mar 12 07:54:30 2018 (r464230) @@ -1,6 +1,6 @@ ---- SConstruct.orig 2015-04-21 15:32:43 UTC -+++ SConstruct -@@ -534,6 +534,9 @@ Export('MakeAction') +--- SConstruct.orig 2015-04-21 11:32:43.000000000 -0400 ++++ SConstruct 2018-03-11 21:17:31.106873000 -0400 +@@ -534,6 +534,9 @@ main['LTO_CCFLAGS'] = [] main['LTO_LDFLAGS'] = [] @@ -10,7 +10,7 @@ # According to the readme, tcmalloc works best if the compiler doesn't # assume that we're using the builtin malloc and friends. These flags # are compiler-specific, so we need to set them after we detect which -@@ -785,13 +788,8 @@ if main['GCC'] and compareVersions(gcc_v +@@ -785,13 +788,8 @@ swig_flags=Split('-c++ -python -modern -templatereduce $_CPPINCFLAGS') main.Append(SWIGFLAGS=swig_flags) @@ -26,3 +26,14 @@ main['TIMEOUT'] = timeout_version and \ compareVersions(timeout_version[-1], '8.13') >= 0 +@@ -922,8 +920,8 @@ + # version of python, see above for instructions on how to invoke + # scons with the appropriate PATH set. + # +- # First we check if python2-config exists, else we use python-config +- python_config = readCommand(['which', 'python2-config'], ++ # First we check if python2.7-config exists, else we use python-config ++ python_config = readCommand(['which', 'python2.7-config'], + exception='').strip() + if not os.path.exists(python_config): + python_config = readCommand(['which', 'python-config'],