[commit: ghc] master: Fix bug in hs-libraries field munging. (fd17651)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/fd176515f5259d9793d08299dd3b03f384fb504c/ghc

>---------------------------------------------------------------

commit fd176515f5259d9793d08299dd3b03f384fb504c
Author: Edward Z. Yang <ezyang at cs.stanford.edu>
Date:   Wed Mar 18 15:28:29 2015 -0700

    Fix bug in hs-libraries field munging.
    
    Signed-off-by: Edward Z. Yang <ezyang at cs.stanford.edu>
    
    Test Plan: validate with 7.8 stage0 and HEAD stage0
    
    Reviewers: austin, kgardas
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D740


>---------------------------------------------------------------

fd176515f5259d9793d08299dd3b03f384fb504c
 compiler/ghc.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/compiler/ghc.mk b/compiler/ghc.mk
index b692891..132a4dd 100644
--- a/compiler/ghc.mk
+++ b/compiler/ghc.mk
@@ -727,11 +727,12 @@ endif
 # Note [munge-stage1-package-config]
 # Strip the date/patchlevel from the version of stage1.  See Note
 # [fiddle-stage1-version] above.
+# NB: The sed expression for hs-libraries is a bit weird to be POSIX-compliant.
 ifeq "$(compiler_stage1_VERSION_MUNGED)" "YES"
 compiler/stage1/inplace-pkg-config-munged: compiler/stage1/inplace-pkg-config
 	sed -e 's/^\(version: .*\)\.$(ProjectPatchLevel)$$/\1/' \
 	    -e 's/^\(id: .*\)\.$(ProjectPatchLevel)$$/\1/' \
-	    -e 's/^\(hs-libraries: HSghc-.*\)\.$(ProjectPatchLevel)$$/\1/' \
+	    -e 's/^\(hs-libraries: HSghc-.*\)\.$(ProjectPatchLevel)\(-[A-Za-z0-9][A-Za-z0-9]*\)*$$/\1\2/' \
 	  < $< > $@
 	"$(compiler_stage1_GHC_PKG)" update --force $(compiler_stage1_GHC_PKG_OPTS) $@