[94021] trunk/dports/devel/valgrind

[raimue at macports.org]

Revision: 94021
          https://trac.macports.org/changeset/94021
Author:   raimue at macports.org
Date:     2012-06-06 14:57:32 -0700 (Wed, 06 Jun 2012)
Log Message:
-----------
devel/valgrind:
Support for i386 was broken if compiled with clang.

Upstream reports:
    https://bugs.kde.org/show_bug.cgi?id=295427
    https://bugs.kde.org/show_bug.cgi?id=295428

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

Added Paths:
-----------
    trunk/dports/devel/valgrind/files/
    trunk/dports/devel/valgrind/files/patch-clang-new_linker.diff
    trunk/dports/devel/valgrind/files/patch-incorrect-x86-assembly.diff

Modified: trunk/dports/devel/valgrind/Portfile
===================================================================
--- trunk/dports/devel/valgrind/Portfile	2012-06-06 21:56:31 UTC (rev 94020)
+++ trunk/dports/devel/valgrind/Portfile	2012-06-06 21:57:32 UTC (rev 94021)
@@ -5,6 +5,7 @@
 name            valgrind
 conflicts       valgrind-devel
 version         3.7.0
+revision        1
 categories      devel
 platforms       darwin
 supported_archs i386 x86_64
@@ -38,6 +39,9 @@
 # Ignore trace reports about boost, Qt and OpenMP
 # as they are only used for tests
 
+patchfiles      patch-clang-new_linker.diff \
+                patch-incorrect-x86-assembly.diff
+
 configure.args  --mandir=${prefix}/share/man \
                 --without-mpicc
 

Added: trunk/dports/devel/valgrind/files/patch-clang-new_linker.diff
===================================================================
--- trunk/dports/devel/valgrind/files/patch-clang-new_linker.diff	                        (rev 0)
+++ trunk/dports/devel/valgrind/files/patch-clang-new_linker.diff	2012-06-06 21:57:32 UTC (rev 94021)
@@ -0,0 +1,15 @@
+https://bugs.kde.org/show_bug.cgi?id=295427
+Index: coregrind/link_tool_exe_darwin.in
+===================================================================
+--- coregrind/link_tool_exe_darwin.in	2011-10-26 23:24:45.000000000 +0200
++++ coregrind/link_tool_exe_darwin.in	2012-05-25 17:00:57.000000000 +0200
+@@ -140,6 +140,9 @@
+ my $cmd = "/usr/bin/ld";
+ 
+ $cmd = "$cmd -static";
++if ('@CC@' =~ /clang$/ || `readlink '@CC@'` =~ /clang$/) {
++    $cmd = "$cmd -new_linker";
++}
+ $cmd = "$cmd -arch $archstr";
+ $cmd = "$cmd -macosx_version_min 10.5";
+ $cmd = "$cmd -o $outname";

Added: trunk/dports/devel/valgrind/files/patch-incorrect-x86-assembly.diff
===================================================================
--- trunk/dports/devel/valgrind/files/patch-incorrect-x86-assembly.diff	                        (rev 0)
+++ trunk/dports/devel/valgrind/files/patch-incorrect-x86-assembly.diff	2012-06-06 21:57:32 UTC (rev 94021)
@@ -0,0 +1,13 @@
+https://bugs.kde.org/show_bug.cgi?id=295428
+Index: coregrind/m_main.c
+===================================================================
+--- coregrind/m_main.c	(revision 12418)
++++ coregrind/m_main.c	(working copy)
+@@ -2842,6 +2842,7 @@ asm("\n"
+     "\tandl  $~15, %eax\n"
+     /* install it, and collect the original one */
+     "\txchgl %eax, %esp\n"
++    "\tsubl  $12, %esp\n"
+     /* call _start_in_C_darwin, passing it the startup %esp */
+     "\tpushl %eax\n"
+     "\tcall  __start_in_C_darwin\n"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120606/ba84b6c8/attachment.html>