From owner-svn-ports-all@freebsd.org Mon Jan 30 10:18:14 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 47455CC76E1; Mon, 30 Jan 2017 10:18:14 +0000 (UTC) (envelope-from amdmi3@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 mx1.freebsd.org (Postfix) with ESMTPS id 08CDF1B2B; Mon, 30 Jan 2017 10:18:13 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0UAID46099991; Mon, 30 Jan 2017 10:18:13 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0UAIDIk099989; Mon, 30 Jan 2017 10:18:13 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201701301018.v0UAIDIk099989@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 30 Jan 2017 10:18:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r432826 - in branches/2017Q1/audio/festival: . files X-SVN-Group: ports-branches 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.23 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, 30 Jan 2017 10:18:14 -0000 Author: amdmi3 Date: Mon Jan 30 10:18:12 2017 New Revision: 432826 URL: https://svnweb.freebsd.org/changeset/ports/432826 Log: MFH: r432825 - 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) Approved by: ports-secteam (with hat) Added: branches/2017Q1/audio/festival/files/patch-speech__tools_config_compilers_gcc.mak - copied unchanged from r432825, head/audio/festival/files/patch-speech__tools_config_compilers_gcc.mak Modified: branches/2017Q1/audio/festival/Makefile Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/audio/festival/Makefile ============================================================================== --- branches/2017Q1/audio/festival/Makefile Mon Jan 30 10:09:28 2017 (r432825) +++ branches/2017Q1/audio/festival/Makefile Mon Jan 30 10:18:12 2017 (r432826) @@ -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} Copied: branches/2017Q1/audio/festival/files/patch-speech__tools_config_compilers_gcc.mak (from r432825, head/audio/festival/files/patch-speech__tools_config_compilers_gcc.mak) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/audio/festival/files/patch-speech__tools_config_compilers_gcc.mak Mon Jan 30 10:18:12 2017 (r432826, copy of r432825, head/audio/festival/files/patch-speech__tools_config_compilers_gcc.mak) @@ -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