On Fri, Feb 20, 2009 at 01:05:24PM +0100, Jan Nieuwenhuizen wrote:
> On do, 2009-02-19 at 13:41 -0800, Patrick McCarty wrote:
> 
> > Bumping gmp to 4.2.4 for darwin-x86, and removing the patch and
> > configure_command (), fixed the darwin-x86 build for me.
> 
> Ok, great.  Do you have a patch?  Han-Wen, can you verify and apply?

Yes, here it is.

Thanks,
Patrick
>From 4d14fb713fe9c492da0f33264080b5080a56c08a Mon Sep 17 00:00:00 2001
From: Patrick McCarty <pnor...@gmail.com>
Date: Thu, 19 Feb 2009 12:09:45 -0800
Subject: [PATCH] Fix gmp for darwin-x86 on 32-bit OS, 64-bit system

* Manually setting ABI=32 and host=none-apple-darwin8
  was causing configure to fail for gmp 4.2.1.

  In gmp 4.2.4, the assembler errors appear to be fixed,
  so the host override is no longer needed.  I can compile
  without the patch for 4.2.1, so I removed it too.

  This has also been tested on a 32-bit system.
---
 gub/specs/gmp.py |   12 +-----------
 1 files changed, 1 insertions(+), 11 deletions(-)

diff --git a/gub/specs/gmp.py b/gub/specs/gmp.py
index 8cda7f7..61a73f8 100644
--- a/gub/specs/gmp.py
+++ b/gub/specs/gmp.py
@@ -39,17 +39,7 @@ class Gmp__darwin (Gmp):
                        '%(install_prefix)s/include/gmp.h')
 
 class Gmp__darwin__x86 (Gmp__darwin):
-    def patch (self):
-        Gmp__darwin.patch (self)
-        self.apply_patch ('gmp-4.2.1-x86fat.patch')
-        
-    def configure_command (self):
-
-        ## bypass oddball assembler errors. 
-        c = Gmp__darwin.configure_command (self)
-        c = re.sub ('host=[^ ]+', 'host=none-apple-darwin8', c)
-        c = re.sub ('--target=[^ ]+', ' ', c)
-        return c
+    source = 'ftp://ftp.gnu.org/pub/gnu/gmp/gmp-4.2.4.tar.gz'
 
 class Gmp__cygwin (Gmp):
     source = 'ftp://ftp.gnu.org/pub/gnu/gmp/gmp-4.1.4.tar.gz'
-- 
1.6.1.3

_______________________________________________
lilypond-devel mailing list
lilypond-devel@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-devel

Reply via email to