[42726] trunk/dports/devel/libgii

[toby at macports.org]

Revision: 42726
          http://trac.macports.org/changeset/42726
Author:   toby at macports.org
Date:     2008-11-29 17:35:16 -0800 (Sat, 29 Nov 2008)
Log Message:
-----------
fix intel build using patch from libgii cvs, fixes #11838

Modified Paths:
--------------
    trunk/dports/devel/libgii/Portfile

Added Paths:
-----------
    trunk/dports/devel/libgii/files/
    trunk/dports/devel/libgii/files/patch-configure
    trunk/dports/devel/libgii/files/patch-m4__swar.m4

Modified: trunk/dports/devel/libgii/Portfile
===================================================================
--- trunk/dports/devel/libgii/Portfile	2008-11-30 00:51:46 UTC (rev 42725)
+++ trunk/dports/devel/libgii/Portfile	2008-11-30 01:35:16 UTC (rev 42726)
@@ -30,6 +30,7 @@
 
 worksrcdir       ${name}-${version}
 
+patchfiles       patch-configure patch-m4__swar.m4
 post-patch {
 	reinplace "s|need_relink=yes|need_relink=no|" \
 		${worksrcpath}/ltmain.sh

Added: trunk/dports/devel/libgii/files/patch-configure
===================================================================
--- trunk/dports/devel/libgii/files/patch-configure	                        (rev 0)
+++ trunk/dports/devel/libgii/files/patch-configure	2008-11-30 01:35:16 UTC (rev 42726)
@@ -0,0 +1,14 @@
+--- configure.orig	2008-11-29 17:32:51.000000000 -0800
++++ configure	2008-11-29 17:33:20.000000000 -0800
+@@ -10920,7 +10920,10 @@
+ 	#ifdef _MSC_VER
+ 	__asm cpuid
+ 	#else
+-	asm("cpuid": "=a" (a), "=b" (b), "=c" (c), "=d" (d) : "a" (in));
++	asm("mov %%ebx, %%esi\n\t"
++	    "cpuid\n\t"
++	    "xchg %%esi, %%ebx\n\t"
++	    : "=a" (a), "=S" (b), "=c" (c), "=d" (d) : "a" (in));
+ 	#endif
+ 	return d;
+   ;

Added: trunk/dports/devel/libgii/files/patch-m4__swar.m4
===================================================================
--- trunk/dports/devel/libgii/files/patch-m4__swar.m4	                        (rev 0)
+++ trunk/dports/devel/libgii/files/patch-m4__swar.m4	2008-11-30 01:35:16 UTC (rev 42726)
@@ -0,0 +1,14 @@
+--- m4/swar.m4	2005/07/12 12:42:46	1.11
++++ m4/swar.m4	2007/06/03 06:39:38	1.11.2.1
+@@ -34,7 +34,10 @@
+ 	#ifdef _MSC_VER
+ 	__asm cpuid
+ 	#else
+-	asm("cpuid": "=a" (a), "=b" (b), "=c" (c), "=d" (d) : "a" (in));
++	asm("mov %%ebx, %%esi\n\t"
++	    "cpuid\n\t"
++	    "xchg %%esi, %%ebx\n\t"
++	    : "=a" (a), "=S" (b), "=c" (c), "=d" (d) : "a" (in));
+ 	#endif
+ 	return d;],
+ 	ggi_cv_cc_can_cpuid="yes", ggi_cv_cc_can_cpuid="no")])
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20081129/b3a7d1ea/attachment.html>