[112054] trunk/dports/emulators/qemu

[raimue at macports.org]

Revision: 112054
          https://trac.macports.org/changeset/112054
Author:   raimue at macports.org
Date:     2013-10-10 11:04:13 -0700 (Thu, 10 Oct 2013)
Log Message:
-----------
emulators/qemu:
Update to version 1.6.1, closes #40718. Backport a patch locally for a bug
introduced when compiling with clang, closes #40722.

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

Added Paths:
-----------
    trunk/dports/emulators/qemu/files/patch-cpu-exec-c.diff

Modified: trunk/dports/emulators/qemu/Portfile
===================================================================
--- trunk/dports/emulators/qemu/Portfile	2013-10-10 17:02:15 UTC (rev 112053)
+++ trunk/dports/emulators/qemu/Portfile	2013-10-10 18:04:13 UTC (rev 112054)
@@ -3,7 +3,7 @@
 PortSystem 1.0
 
 name                    qemu
-version                 1.6.0
+version                 1.6.1
 categories              emulators
 license                 GPL-2+
 platforms               darwin
@@ -19,10 +19,11 @@
 master_sites            ${homepage}/download
 use_bzip2 yes
 
-checksums               rmd160  e9cd36df6cba757a37dd34b7889f3190e7b6f222 \
-                        sha256  3132e58ada26d43b6924e8c2f07db80aa1e5022f3dcf03dee7d8bb9194b2cb48
+checksums               rmd160  96dcbb044812ab0349741bd62eb8e6b79552442f \
+                        sha256  fc736f44aa10478223c881310a7e40fc8386547e9cadf7d01ca4685951605294
 
-patchfiles              patch-configure.diff
+patchfiles              patch-configure.diff \
+                        patch-cpu-exec-c.diff
 
 depends_build           port:texinfo \
                         port:libtool \

Added: trunk/dports/emulators/qemu/files/patch-cpu-exec-c.diff
===================================================================
--- trunk/dports/emulators/qemu/files/patch-cpu-exec-c.diff	                        (rev 0)
+++ trunk/dports/emulators/qemu/files/patch-cpu-exec-c.diff	2013-10-10 18:04:13 UTC (rev 112054)
@@ -0,0 +1,16 @@
+This patch fixes a bug that only occurs when compiling with clang due to wrong
+handling of longjmp().
+Upstream: https://lists.nongnu.org/archive/html/qemu-devel/2013-10/msg00503.html
+--- cpu-exec.c.orig	2013-10-10 00:30:30.000000000 -0400
++++ cpu-exec.c	2013-10-10 00:32:37.000000000 -0400
+@@ -681,6 +681,10 @@
+              * local variables as longjmp is marked 'noreturn'. */
+             cpu = current_cpu;
+             env = cpu->env_ptr;
++#if !(defined(CONFIG_USER_ONLY) && \
++     (defined(TARGET_M68K) || defined(TARGET_PPC) || defined(TARGET_S390X)))
++            cc = CPU_GET_CLASS(cpu);
++#endif
+         }
+     } /* for(;;) */
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131010/f0f26777/attachment.html>