Date: Sun, 27 Jul 2014 18:12:39 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r363085 - in head/devel/scons: . files Message-ID: <201407271812.s6RICdPZ051005@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Sun Jul 27 18:12:39 2014 New Revision: 363085 URL: http://svnweb.freebsd.org/changeset/ports/363085 QAT: https://qat.redports.org/buildarchive/r363085/ Log: devel/scons: Use GNU M4 over base m4 Scons issues "m4 -E" commands, but the version of m4 including in CURRENT doesn't understand -E switch. Use gm4 instead. PR: 189691 Submitted by: clutton0 (gmail) Approved by: maintainer (Gavin McDonald) Added: head/devel/scons/files/patch-engine_SCons_Tool_m4.py (contents, props changed) Modified: head/devel/scons/Makefile Modified: head/devel/scons/Makefile ============================================================================== --- head/devel/scons/Makefile Sun Jul 27 16:38:16 2014 (r363084) +++ head/devel/scons/Makefile Sun Jul 27 18:12:39 2014 (r363085) @@ -3,6 +3,7 @@ PORTNAME= scons PORTVERSION= 2.3.0 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION} @@ -11,6 +12,8 @@ COMMENT= Build tool alternative to make LICENSE= MIT +RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4 + USE_PYTHON= 2 USE_PYDISTUTILS= yes PYDISTUTILS_AUTOPLIST= yes @@ -22,5 +25,6 @@ post-patch: -e 's,distutils\.command\.install$$,setuptools\.command\.install,' \ -e 's,distutils\.command\.install\.,setuptools\.command\.install\.,' \ ${WRKSRC}/setup.py + @${FIND} ${WRKSRC} -name \*.orig -delete .include <bsd.port.mk> Added: head/devel/scons/files/patch-engine_SCons_Tool_m4.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/scons/files/patch-engine_SCons_Tool_m4.py Sun Jul 27 18:12:39 2014 (r363085) @@ -0,0 +1,11 @@ +--- engine/SCons/Tool/m4.py.orig 2013-03-03 14:48:40.000000000 +0000 ++++ engine/SCons/Tool/m4.py +@@ -49,7 +49,7 @@ def generate(env): + # file and run from there. + # The src_suffix setup is like so: file.c.m4 -> file.c, + # file.cpp.m4 -> file.cpp etc. +- env['M4'] = 'm4' ++ env['M4'] = 'gm4' + env['M4FLAGS'] = SCons.Util.CLVar('-E') + env['M4COM'] = 'cd ${SOURCE.rsrcdir} && $M4 $M4FLAGS < ${SOURCE.file} > ${TARGET.abspath}' +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407271812.s6RICdPZ051005>