[59291] trunk/dports/devel/liboil

blb at macports.org blb at macports.org
Mon Oct 12 23:14:41 PDT 2009


Revision: 59291
          http://trac.macports.org/changeset/59291
Author:   blb at macports.org
Date:     2009-10-12 23:14:37 -0700 (Mon, 12 Oct 2009)
Log Message:
-----------
devel/liboil - fix CPUID issue on 64bit, ticket #21659

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

Added Paths:
-----------
    trunk/dports/devel/liboil/files/patch-liboil_liboilcpu-x86.c.diff

Modified: trunk/dports/devel/liboil/Portfile
===================================================================
--- trunk/dports/devel/liboil/Portfile	2009-10-13 04:54:02 UTC (rev 59290)
+++ trunk/dports/devel/liboil/Portfile	2009-10-13 06:14:37 UTC (rev 59291)
@@ -8,6 +8,7 @@
 
 name		liboil
 version		0.3.16
+revision	1
 description	A library of simple functions that are optimized for various CPUs.
 long_description	${description}
 maintainers	landonf
@@ -19,7 +20,7 @@
                 sha1    0d6530ccb22d805c5209a185a94b575111ec34f3 \
                 rmd160  5add00151e24ee8cc5a8dfb40223936a576cbffd
 
-patchfiles      patch-configure.diff
+patchfiles      patch-configure.diff patch-liboil_liboilcpu-x86.c.diff
 
 depends_build	port:pkgconfig 
 # port:libtool

Added: trunk/dports/devel/liboil/files/patch-liboil_liboilcpu-x86.c.diff
===================================================================
--- trunk/dports/devel/liboil/files/patch-liboil_liboilcpu-x86.c.diff	                        (rev 0)
+++ trunk/dports/devel/liboil/files/patch-liboil_liboilcpu-x86.c.diff	2009-10-13 06:14:37 UTC (rev 59291)
@@ -0,0 +1,23 @@
+--- liboil/liboilcpu-x86.c.orig	2009-02-26 12:42:45.000000000 -0700
++++ liboil/liboilcpu-x86.c	2009-10-12 23:58:07.000000000 -0600
+@@ -162,6 +162,12 @@
+ static void
+ get_cpuid (uint32_t op, uint32_t *a, uint32_t *b, uint32_t *c, uint32_t *d)
+ {
++#ifdef __APPLE__
++  asm (
++      "cpuid"
++      : "=a" (*a), "=b" (*b), "=c" (*c), "=d" (*d)
++      : "a" (op));
++#else
+   __asm__ (
+       "  pushq %%rbx\n"
+       "  cpuid\n"
+@@ -169,6 +175,7 @@
+       "  popq %%rbx\n"
+       : "=a" (*a), "=S" (*b), "=c" (*c), "=d" (*d)
+       : "0" (op));
++#endif
+ }
+ #endif
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091012/6dd27c7a/attachment.html>


More information about the macports-changes mailing list