[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
weinig at apple.com
weinig at apple.com
Mon Feb 21 00:33:53 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit 0eb875643bdd6e62f105cb248bd7624693b4fe68
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Feb 1 22:12:10 2011 +0000
Try to fix the windows build.
* DerivedSources.make:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77301 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 05058d2..8920fc6 100644
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,9 @@
+2011-02-01 Sam Weinig <sam at webkit.org>
+
+ Try to fix the windows build.
+
+ * DerivedSources.make:
+
2011-02-01 Patrick Gansterer <paroga at webkit.org>
Reviewed by Darin Adler.
diff --git a/Source/JavaScriptCore/DerivedSources.make b/Source/JavaScriptCore/DerivedSources.make
index 8262761..0ae5944 100644
--- a/Source/JavaScriptCore/DerivedSources.make
+++ b/Source/JavaScriptCore/DerivedSources.make
@@ -85,10 +85,15 @@ JavaScriptCore.JSVALUE32_64.exp: JavaScriptCore.exp JavaScriptCore.JSVALUE32_64o
JavaScriptCore.JSVALUE64.exp: JavaScriptCore.exp JavaScriptCore.JSVALUE64only.exp
cat $^ > $@
+
# header detection
+ifeq ($(OS),MACOS)
+
HeaderDetection.h : DerivedSources.make /System/Library/CoreServices/SystemVersion.plist
rm -f $@
echo "/* This is a generated file. Do not edit. */" > $@
if [ -f $(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders/pthread_machdep.h ]; then echo "#define HAVE_PTHREAD_MACHDEP_H 1" >> $@; else echo >> $@; fi
if [ -f $(SDKROOT)/System/Library/Frameworks/AppKit.framework/PrivateHeaders/NSScrollerImpPair_Private.h ]; then echo "#define USE_WK_SCROLLBAR_PAINTER_AND_CONTROLLER 1" >> $@; else echo >> $@; fi
+
+endif
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list