Date: Thu, 10 Aug 2017 20:55:04 +0000 (UTC) From: "Tobias C. Berner" <tcberner@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r447723 - in head/lang/ghc: . files Message-ID: <201708102055.v7AKt4sJ093510@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tcberner Date: Thu Aug 10 20:55:04 2017 New Revision: 447723 URL: https://svnweb.freebsd.org/changeset/ports/447723 Log: Fix patch for ar/ld/gcc paths. * In r447548 the updated patch unfortunately contained the sed'ed values. * Also make the sed call not echo during build again. Reported by: Gleb Popov <6yearold@gmail.com> Approved by: pgj Differential Revision: https://reviews.freebsd.org/D11961 Modified: head/lang/ghc/Makefile head/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs Modified: head/lang/ghc/Makefile ============================================================================== --- head/lang/ghc/Makefile Thu Aug 10 20:50:41 2017 (r447722) +++ head/lang/ghc/Makefile Thu Aug 10 20:55:04 2017 (r447723) @@ -3,6 +3,7 @@ PORTNAME= ghc PORTVERSION= ${GHC_VERSION} +PORTREVISION= 1 CATEGORIES= lang haskell MASTER_SITES= http://www.haskell.org/ghc/dist/${PORTVERSION}/:source \ LOCAL/pgj/:boot @@ -190,7 +191,7 @@ post-install-script: .endif post-patch: - ${REINPLACE_CMD} -e 's|%%CC%%|${CC}|; \ + @${REINPLACE_CMD} -e 's|%%CC%%|${CC}|; \ s|%%AR%%|${AR}|; \ s|%%LD%%|${LD}|' \ ${WRKSRC}/libraries/Cabal/Cabal/Distribution/Simple/Program/Builtin.hs Modified: head/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs ============================================================================== --- head/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs Thu Aug 10 20:50:41 2017 (r447722) +++ head/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs Thu Aug 10 20:55:04 2017 (r447723) @@ -15,13 +15,13 @@ gccProgram = (simpleProgram "gcc") { - programFindVersion = findProgramVersion "-dumpversion" id - } -+ programFindLocation = \v p -> findProgramOnSearchPath v p "cc" ++ programFindLocation = \v p -> findProgramOnSearchPath v p "%%CC%%" +} arProgram :: Program -arProgram = simpleProgram "ar" +arProgram = (simpleProgram "ar") { -+ programFindLocation = \v p -> findProgramOnSearchPath v p "ar" ++ programFindLocation = \v p -> findProgramOnSearchPath v p "%%AR%%" +} stripProgram :: Program @@ -32,7 +32,7 @@ ldProgram :: Program -ldProgram = simpleProgram "ld" +ldProgram = (simpleProgram "ld") { -+ programFindLocation = \v p -> findProgramOnSearchPath v p "ld" ++ programFindLocation = \v p -> findProgramOnSearchPath v p "%%LD%%" + } tarProgram :: Program
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201708102055.v7AKt4sJ093510>