[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog haskell-cabal.eclass

["Sergei Trofimovich (slyfox)" <slyfox@gentoo.org>]

slyfox      12/04/14 19:30:53

  Modified:             ChangeLog haskell-cabal.eclass
  Log:
  fix -dynamic './setup configure' failures against newer libffi (bug #411789 by Leonid Podolny)

Revision  Changes    Path
1.209                eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.209&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.209&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.208&r2=1.209

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -r1.208 -r1.209
--- ChangeLog	9 Apr 2012 18:08:45 -0000	1.208
+++ ChangeLog	14 Apr 2012 19:30:53 -0000	1.209
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.208 2012/04/09 18:08:45 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.209 2012/04/14 19:30:53 slyfox Exp $
+
+  14 Apr 2012; Sergei Trofimovich <slyfox@gentoo.org> haskell-cabal.eclass:
+  fix -dynamic './setup configure' failures against newer libffi (bug #411789
+  by Leonid Podolny)
 
   09 Apr 2012; Sergei Trofimovich <slyfox@gentoo.org> ghc-package.eclass,
   haskell-cabal.eclass:



1.30                 eclass/haskell-cabal.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?rev=1.30&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?rev=1.30&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?r1=1.29&r2=1.30

Index: haskell-cabal.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- haskell-cabal.eclass	9 Apr 2012 18:08:45 -0000	1.29
+++ haskell-cabal.eclass	14 Apr 2012 19:30:53 -0000	1.30
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.29 2012/04/09 18:08:45 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.30 2012/04/14 19:30:53 slyfox Exp $
 
 # @ECLASS: haskell-cabal.eclass
 # @MAINTAINER:
@@ -172,9 +172,12 @@
 		$(ghc-getghc) "$@"
 	}
 	if $(ghc-supports-shared-libraries); then
-		# some custom build systems might use external libraries,
-		# for which we don't have shared libs, so keep static fallback
-		make_setup -dynamic "$@" || make_setup "$@" || die "compiling ${setupmodule} failed"
+		# # some custom build systems might use external libraries,
+		# # for which we don't have shared libs, so keep static fallback
+		# Disabled '-dynamic' as ghc does not embed RPATH to used extra-libraries:
+		# bug #411789, http://hackage.haskell.org/trac/ghc/ticket/5743#comment:3
+		# make_setup -dynamic "$@" ||
+		make_setup "$@" || die "compiling ${setupmodule} failed"
 	else
 		make_setup "$@" || die "compiling ${setupmodule} failed"
 	fi