diff --git a/lang/ghc7/distinfo b/lang/ghc7/distinfo index 889fc566dcb2..a27ffa0aa9fb 100644 --- a/lang/ghc7/distinfo +++ b/lang/ghc7/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2014/05/21 16:07:59 jperkin Exp $ +$NetBSD: distinfo,v 1.4 2014/05/24 04:49:40 obache Exp $ SHA1 (ghc-7.6.3-src.tar.bz2) = 8938e1ef08b37a4caa071fa169e79a3001d065ff RMD160 (ghc-7.6.3-src.tar.bz2) = 82a673ed38b7cf9a59afeb01057625fc761a822b @@ -12,4 +12,4 @@ SHA1 (patch-libraries_unix_System_Posix_Files.hsc) = f2e0892f9ebb9d82ddaf71b014d SHA1 (patch-mk_config.mk.in) = 90a156f6c455d4b2c5d10fdf65b3a170dcfc4892 SHA1 (patch-rts_Linker.c) = 39d1ca7a856a3ec25e493e97832ef255562c0719 SHA1 (patch-rts_StgCRun.c) = dcbc883cb4826aeccac0be09647b7889c7809271 -SHA1 (patch-rts_ghc.mk) = 437e64cb7a52784b344b7e0ec7027fc8f63938b3 +SHA1 (patch-rts_ghc.mk) = ad6f2e7dccc3027c7770164bfdab066cbfef3a6d diff --git a/lang/ghc7/patches/patch-rts_ghc.mk b/lang/ghc7/patches/patch-rts_ghc.mk index d8d509dda63e..4194f7be60d2 100644 --- a/lang/ghc7/patches/patch-rts_ghc.mk +++ b/lang/ghc7/patches/patch-rts_ghc.mk @@ -1,4 +1,4 @@ -$NetBSD: patch-rts_ghc.mk,v 1.2 2014/05/21 16:07:59 jperkin Exp $ +$NetBSD: patch-rts_ghc.mk,v 1.3 2014/05/24 04:49:40 obache Exp $ This is pkgsrc specific: dtrace(1) gets confused when we have gcc wrappers in the PATH so we have to hide them: @@ -16,7 +16,7 @@ Also install libffi.{a,la} so we can expand to figure out .so extensions. # depend on libffi.so, but copy libffi.so* rts/dist/build/libffi$(soext): libffi/build/inst/lib/libffi$(soext) cp libffi/build/inst/lib/libffi$(soext)* rts/dist/build -+ cp libffi/build/inst/lib/libffi.{a,la} rts/dist/build ++ cp libffi/build/inst/lib/libffi.*a rts/dist/build rts/dist/build/$(LIBFFI_DLL): libffi/build/inst/bin/$(LIBFFI_DLL) cp $< $@