kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix patch for ar/ld/gcc paths.

Browse source 
* 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
This commit is contained in:
Tobias C. Berner 2017-08-10 20:55:04 +00:00
parent 6349b12801
commit d4e00fcf72
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=447723
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lang/ghc/Makefile
View file

@ -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

6
lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs
View file

@ -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