Date: Sat, 8 Apr 2017 13:49:14 +0000 (UTC) From: Thomas Zander <riggs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r438043 - in head/multimedia/handbrake: . files Message-ID: <201704081349.v38DnEHk076033@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: riggs Date: Sat Apr 8 13:49:13 2017 New Revision: 438043 URL: https://svnweb.freebsd.org/changeset/ports/438043 Log: Honour CC var instead of hardcoded gcc PR: 218470 Submitted by: naito.yuichiro@gmail.com Reported by: gerald Modified: head/multimedia/handbrake/Makefile head/multimedia/handbrake/files/patch-make_configure.py Modified: head/multimedia/handbrake/Makefile ============================================================================== --- head/multimedia/handbrake/Makefile Sat Apr 8 13:02:36 2017 (r438042) +++ head/multimedia/handbrake/Makefile Sat Apr 8 13:49:13 2017 (r438043) @@ -3,6 +3,7 @@ PORTNAME= handbrake PORTVERSION= 1.0.3 +PORTREVISION= 1 CATEGORIES= multimedia DIST_SUBDIR= ${PORTNAME} @@ -120,6 +121,9 @@ post-extract: .SILENT ${CP} ${DISTDIR}/${DIST_SUBDIR}/${f} ${WRKSRC}/download .endfor +#post-patch: +# ${REINPLACE_CMD} -e 's|%%CC%%|${CC}|g' ${WRKSRC}/make/configure.py + post-install-X11-on: ${LN} -sf ghb ${STAGEDIR}${PREFIX}/bin/HandBrake Modified: head/multimedia/handbrake/files/patch-make_configure.py ============================================================================== --- head/multimedia/handbrake/files/patch-make_configure.py Sat Apr 8 13:02:36 2017 (r438042) +++ head/multimedia/handbrake/files/patch-make_configure.py Sat Apr 8 13:49:13 2017 (r438043) @@ -36,6 +36,15 @@ grp.add_option( '--flatpak', default=False, action='store_true', help=h ) cli.add_option_group( grp ) +@@ -1517,7 +1520,7 @@ try: + class Tools: + ar = ToolProbe( 'AR.exe', 'ar' ) + cp = ToolProbe( 'CP.exe', 'cp' ) +- gcc = ToolProbe( 'GCC.gcc', 'gcc', IfHost( 'gcc-4', '*-*-cygwin*' )) ++ gcc = ToolProbe( 'GCC.gcc', 'gcc', IfHost( os.environ['CC'], '*-*-freebsd*' )) + + if host.match( '*-*-darwin*' ): + gmake = ToolProbe( 'GMAKE.exe', 'make', 'gmake' ) @@ -1924,10 +1927,15 @@ int main() doc.add( 'GCC.sysroot', '' ) doc.add( 'GCC.minver', '' )
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201704081349.v38DnEHk076033>