mirror of
https://github.com/yann64/haikuports.git
synced 2026-05-03 05:28:53 +02:00
patch cleanup: Make sure recipes have matching patches.
* Ruby 1.9.3 shouldn't point to the 1.9.1 patch, etc.
This commit is contained in:
@@ -26,7 +26,7 @@ SECONDARY_ARCHITECTURES="x86"
|
||||
|
||||
|
||||
if [ $effectiveTargetArchitecture == x86_64 ]; then
|
||||
PATCHES="haikuwebkit-1.2.5.patchset"
|
||||
PATCHES="haikuwebkit-1.3.0.patchset"
|
||||
fi
|
||||
|
||||
PROVIDES="
|
||||
|
||||
@@ -26,7 +26,7 @@ SECONDARY_ARCHITECTURES="x86"
|
||||
|
||||
|
||||
if [ $effectiveTargetArchitecture == x86_64 ]; then
|
||||
PATCHES="haikuwebkit-1.2.5.patchset"
|
||||
PATCHES="haikuwebkit-1.3.1.patchset"
|
||||
fi
|
||||
|
||||
PROVIDES="
|
||||
|
||||
@@ -26,7 +26,7 @@ SECONDARY_ARCHITECTURES="x86"
|
||||
|
||||
|
||||
if [ $effectiveTargetArchitecture == x86_64 ]; then
|
||||
PATCHES="haikuwebkit-1.2.5.patchset"
|
||||
PATCHES="haikuwebkit-1.3.2.patchset"
|
||||
fi
|
||||
|
||||
PROVIDES="
|
||||
|
||||
29
haiku-libs/haikuwebkit/patches/haikuwebkit-1.3.0.patchset
Normal file
29
haiku-libs/haikuwebkit/patches/haikuwebkit-1.3.0.patchset
Normal file
@@ -0,0 +1,29 @@
|
||||
From 77b90ebb44229f5e920e95d517cd153c5c3c0ce8 Mon Sep 17 00:00:00 2001
|
||||
From: Jonathan Schleifer <js@webkeks.org>
|
||||
Date: Wed, 19 Mar 2014 00:52:39 +0100
|
||||
Subject: [PATCH] Fix compilation on x86_64
|
||||
|
||||
---
|
||||
Source/JavaScriptCore/offlineasm/asm.rb | 6 +++++-
|
||||
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Source/JavaScriptCore/offlineasm/asm.rb b/Source/JavaScriptCore/offlineasm/asm.rb
|
||||
index 8fe6228..0f5849c 100644
|
||||
--- a/Source/JavaScriptCore/offlineasm/asm.rb
|
||||
+++ b/Source/JavaScriptCore/offlineasm/asm.rb
|
||||
@@ -209,7 +209,11 @@ class Assembler
|
||||
|
||||
def self.labelReference(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
|
||||
--
|
||||
Jonathan
|
||||
|
||||
29
haiku-libs/haikuwebkit/patches/haikuwebkit-1.3.1.patchset
Normal file
29
haiku-libs/haikuwebkit/patches/haikuwebkit-1.3.1.patchset
Normal file
@@ -0,0 +1,29 @@
|
||||
From 77b90ebb44229f5e920e95d517cd153c5c3c0ce8 Mon Sep 17 00:00:00 2001
|
||||
From: Jonathan Schleifer <js@webkeks.org>
|
||||
Date: Wed, 19 Mar 2014 00:52:39 +0100
|
||||
Subject: [PATCH] Fix compilation on x86_64
|
||||
|
||||
---
|
||||
Source/JavaScriptCore/offlineasm/asm.rb | 6 +++++-
|
||||
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Source/JavaScriptCore/offlineasm/asm.rb b/Source/JavaScriptCore/offlineasm/asm.rb
|
||||
index 8fe6228..0f5849c 100644
|
||||
--- a/Source/JavaScriptCore/offlineasm/asm.rb
|
||||
+++ b/Source/JavaScriptCore/offlineasm/asm.rb
|
||||
@@ -209,7 +209,11 @@ class Assembler
|
||||
|
||||
def self.labelReference(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
|
||||
--
|
||||
Jonathan
|
||||
|
||||
@@ -33,7 +33,7 @@ BUILD_PREREQUIRES="
|
||||
|
||||
SOURCE_DIR="libprefs125"
|
||||
|
||||
PATCHES="libprefs.patch"
|
||||
PATCHES="libprefs-1.2.5.patch"
|
||||
|
||||
BUILD()
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user