Date: Mon, 30 Jan 2017 10:09:28 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r432825 - in head/audio/festival: . files Message-ID: <201701301009.v0UA9SlM095895@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Mon Jan 30 10:09:28 2017 New Revision: 432825 URL: https://svnweb.freebsd.org/changeset/ports/432825 Log: - Fix build when CC is absolute path Upstream build scripts have some machinery to include compiler-specific .mak file depending on compiler used. This is handled in an ugly way by the port, roughly, upstream makefile includes ${CC}.mak and ports Makefile copies that from default .mak. This is breaks when CC is an absolute path and is useless anyway, as even if it was implemented properly, customized .mak files are for compilers we'll never use such as gcc 3.2, intel and suncc. So make upstream makefile always include the default .mak. PR: 215253 Approved by: maintainer timeout (mi@aldan.algebra.com, 6 weeks) MFH: 2017Q1 Added: head/audio/festival/files/patch-speech__tools_config_compilers_gcc.mak (contents, props changed) Modified: head/audio/festival/Makefile Modified: head/audio/festival/Makefile ============================================================================== --- head/audio/festival/Makefile Mon Jan 30 09:39:23 2017 (r432824) +++ head/audio/festival/Makefile Mon Jan 30 10:09:28 2017 (r432825) @@ -87,14 +87,11 @@ do-configure: # This step helps non-i386 systems and is harmless on i386 -${LN} -s ix86_FreeBSD.mak ${WRKDIR}/$d/config/systems/${ARCH:S/armv6/arm/}_unknown.mak .endfor - ${REINPLACE_CMD} \ + @${REINPLACE_CMD} \ -e '/^CFLAGS *=/s|$$| ${CFLAGS}|' \ -e '/^CXXFLAGS *=/s|$$| ${CXXFLAGS}|' \ -e 's,^OPTIMI,#OPTIMI,' \ ${WRKSRC}/speech_tools/config/compilers/gcc*.mak - # This step helps to use a compiler, the vendor has not seen before: - ${TEST} -e ${WRKDIR}/speech_tools/config/compilers/${CC}.mak || \ - ${LN} -s gcc_defaults.mak ${WRKDIR}/speech_tools/config/compilers/${CC}.mak do-install: @${MKDIR} ${STAGEDIR}${DATADIR} Added: head/audio/festival/files/patch-speech__tools_config_compilers_gcc.mak ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/festival/files/patch-speech__tools_config_compilers_gcc.mak Mon Jan 30 10:09:28 2017 (r432825) @@ -0,0 +1,11 @@ +--- speech_tools/config/compilers/gcc.mak.orig 2001-04-04 11:55:32 UTC ++++ speech_tools/config/compilers/gcc.mak +@@ -38,8 +38,4 @@ + ## ## + ########################################################################### + +-ifdef GCC +-include $(EST)/config/compilers/$(GCC).mak +-else + include $(EST)/config/compilers/gcc_defaults.mak +-endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701301009.v0UA9SlM095895>