From owner-svn-ports-all@FreeBSD.ORG  Thu Aug 14 22:01:32 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 59384E4C;
 Thu, 14 Aug 2014 22:01:32 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 EF1123D8A;
 Thu, 14 Aug 2014 21:26:11 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7ELQBvi016011;
 Thu, 14 Aug 2014 21:26:11 GMT (envelope-from pgj@FreeBSD.org)
Received: (from pgj@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7ELQB03016010;
 Thu, 14 Aug 2014 21:26:11 GMT (envelope-from pgj@FreeBSD.org)
Message-Id: <201408142126.s7ELQB03016010@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: pgj set sender to pgj@FreeBSD.org
 using -f
From: Gabor Pali <pgj@FreeBSD.org>
Date: Thu, 14 Aug 2014 21:26:11 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r364869 - head/lang/ghc/files
X-SVN-Group: ports-head
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.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 14 Aug 2014 22:01:32 -0000

Author: pgj
Date: Thu Aug 14 21:26:11 2014
New Revision: 364869
URL: http://svnweb.freebsd.org/changeset/ports/364869
QAT: https://qat.redports.org/buildarchive/r364869/

Log:
  - Fix escaping linker options at configure; this fixes build with SSP
  
  Submitted by:	bdrewery
  Obtained from:	FreeBSD Haskell

Modified:
  head/lang/ghc/files/patch-aclocal.m4

Modified: head/lang/ghc/files/patch-aclocal.m4
==============================================================================
--- head/lang/ghc/files/patch-aclocal.m4	Thu Aug 14 21:06:57 2014	(r364868)
+++ head/lang/ghc/files/patch-aclocal.m4	Thu Aug 14 21:26:11 2014	(r364869)
@@ -14,7 +14,7 @@
      dnl the user to pass them in via LDFLAGS.
      changequote(, )dnl
 -    GHC_LDFLAGS=`echo $LDFLAGS | sed 's/\(^\| \)\([^ ]\)/\1-optl\2/g'`
-+    GHC_LDFLAGS=`echo $LDFLAGS | sed 's/-Wl,-/-optl -/g'`
++    GHC_LDFLAGS=`echo $LDFLAGS | sed -E 's/\(^\| \)\([^ ]\)/\1-optl\2/g'`
      changequote([, ])dnl
      if ! "$WithGhc" $GHC_LDFLAGS -v0 -no-user-$GHC_PACKAGE_DB_FLAG -hidir utils/ghc-pwd/dist-boot -odir utils/ghc-pwd/dist-boot -stubdir utils/ghc-pwd/dist-boot --make utils/ghc-pwd/Main.hs -o utils/ghc-pwd/dist-boot/ghc-pwd
      then