Build fixes on x86_64 to gcc & haikuwebkit

haiku-libs/haikuwebkit/haikuwebkit-1.4.1.recipe

@@ -15,7 +15,7 @@ LICENSE="
 SRC_URI="https://github.com/haiku/webkit/archive/$portVersion.tar.gz"
 CHECKSUM_SHA256="2fcd29738e32a191f16805a94a36da1a60074d10830be77ca5e052ce779cc683"
 SRC_FILENAME="haikuwebkit-$portVersion.tar.gz"
-REVISION="1"
+REVISION="3"
 ARCHITECTURES="x86 x86_64"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
 	# x86_gcc2 is fine as primary target architecture as long as we're building
@@ -24,10 +24,9 @@ if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
 fi
 SECONDARY_ARCHITECTURES="x86"
 
-# TODO see if this is still needed.
-#if [ $effectiveTargetArchitecture == x86_64 ]; then
-#	PATCHES="haikuwebkit-1.3.2.patchset"
-#fi
+if [ $effectiveTargetArchitecture == x86_64 ]; then
+	PATCHES="haikuwebkit-1.4.1.patchset"
+fi
 
 PROVIDES="
 	haikuwebkit$secondaryArchSuffix = $portVersion

haiku-libs/haikuwebkit/patches/haikuwebkit-1.4.1.patchset

@@ -0,0 +1,29 @@
+From 2164474896a1fc5874d15b290376b830ee05d13a Mon Sep 17 00:00:00 2001
+From: Jonathan Schleifer <js@webkeks.org>
+Date: Tue, 22 Jul 2014 04:50:47 +0000
+Subject: Fix compilation on x86_64
+
+
+diff --git a/Source/JavaScriptCore/offlineasm/asm.rb b/Source/JavaScriptCore/offlineasm/asm.rb
+index 88c7d7a..11867fe 100644
+--- a/Source/JavaScriptCore/offlineasm/asm.rb
++++ b/Source/JavaScriptCore/offlineasm/asm.rb
+@@ -213,9 +213,14 @@ class Assembler
+         end
+     end
+ 
++
+     def self.externLabelReference(labelName)
+         if !$emitWinAsm
+-            "\" LOCAL_REFERENCE(#{labelName}) \""
++            if labelName == 'llint_throw_from_slow_path_trampoline'
++                "\" GLOBAL_REFERENCE(#{labelName}) \""
++            else
++                "\" LOCAL_REFERENCE(#{labelName}) \""
++            end
+         else
+             "#{labelName}"
+         end
+-- 
+1.8.3.4
+