[55484] trunk/dports/emulators/qemu

[jmr at macports.org]

Revision: 55484
          http://trac.macports.org/changeset/55484
Author:   jmr at macports.org
Date:     2009-08-11 19:21:49 -0700 (Tue, 11 Aug 2009)
Log Message:
-----------
qemu: set host CPU properly (#19161), remove unused patch

Modified Paths:
--------------
    trunk/dports/emulators/qemu/Portfile

Added Paths:
-----------
    trunk/dports/emulators/qemu/files/patch-configure.diff

Removed Paths:
-------------
    trunk/dports/emulators/qemu/files/qemu-img-CF+IO.diff

Modified: trunk/dports/emulators/qemu/Portfile
===================================================================
--- trunk/dports/emulators/qemu/Portfile	2009-08-12 02:15:01 UTC (rev 55483)
+++ trunk/dports/emulators/qemu/Portfile	2009-08-12 02:21:49 UTC (rev 55484)
@@ -21,15 +21,20 @@
                         sha1    236de8714554d98beb97f3fb34985f709bf7d3be \
                         rmd160  02eec8d3160e80ba9d04e5112977c2242a306a65
 
+patchfiles              patch-configure.diff
+
 configure.args          --cc=${configure.cc}
 
+platform darwin {
+    if {[info exists build_arch]} {
+        configure.args-append --cpu=${build_arch}
+    } elseif {${os.arch} == "powerpc"} {
+        configure.args-append --cpu=ppc
+    } else {
+        configure.args-append --cpu=i386
+    }
+}
+
 platform macosx {
     configure.args-append --enable-cocoa --target-list=i386-softmmu
 }
-
-pre-fetch {
-    if {"darwin" == ${os.platform} && ${os.major} < 9} {
-        ui_error "${name} ${version} requires Mac OS X 10.5 or greater."
-        return -code error "incompatible Mac OS X version"
-    }
-}

Added: trunk/dports/emulators/qemu/files/patch-configure.diff
===================================================================
--- trunk/dports/emulators/qemu/files/patch-configure.diff	                        (rev 0)
+++ trunk/dports/emulators/qemu/files/patch-configure.diff	2009-08-12 02:21:49 UTC (rev 55484)
@@ -0,0 +1,21 @@
+--- configure.orig	2009-05-21 06:46:58.000000000 +1000
++++ configure	2009-08-12 12:15:52.000000000 +1000
+@@ -244,17 +244,7 @@
+ Darwin)
+ bsd="yes"
+ darwin="yes"
+-# on Leopard most of the system is 32-bit, so we have to ask the kernel it if we can run 64-bit userspace code
+-if [ "$cpu" = "i386" ] ; then
+-    is_x86_64=`sysctl -n hw.optional.x86_64`
+-    [ "$is_x86_64" = "1" ] && cpu=x86_64
+-fi
+-if [ "$cpu" = "x86_64" ] ; then
+-    OS_CFLAGS="-arch x86_64"
+-    LDFLAGS="-arch x86_64"
+-else
+-    OS_CFLAGS="-mdynamic-no-pic"
+-fi
++OS_CFLAGS="-mdynamic-no-pic"
+ darwin_user="yes"
+ cocoa="yes"
+ audio_drv_list="coreaudio"

Deleted: trunk/dports/emulators/qemu/files/qemu-img-CF+IO.diff
===================================================================
--- trunk/dports/emulators/qemu/files/qemu-img-CF+IO.diff	2009-08-12 02:15:01 UTC (rev 55483)
+++ trunk/dports/emulators/qemu/files/qemu-img-CF+IO.diff	2009-08-12 02:21:49 UTC (rev 55484)
@@ -1,15 +0,0 @@
-Index: configure
-===================================================================
-RCS file: /sources/qemu/qemu/configure,v
-retrieving revision 1.178
-diff -u -r1.178 configure
---- a/configure	6 Jan 2008 18:27:58 -0000	1.178
-+++ b/configure	7 Jan 2008 23:10:41 -0000
-@@ -151,6 +151,7 @@
- cocoa="yes"
- coreaudio="yes"
- OS_CFLAGS="-mdynamic-no-pic"
-+OS_LDFLAGS="-framework CoreFoundation -framework IOKit"
- ;;
- SunOS)
-     solaris="yes"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090811/5f872449/attachment.html>