Title: [110427] trunk/Tools
- Revision
- 110427
- Author
- [email protected]
- Date
- 2012-03-12 07:52:15 -0700 (Mon, 12 Mar 2012)
Log Message
[BlackBerry] build-webkit doesn't recognize "--cmakearg" for the BlackBerry port
https://bugs.webkit.org/show_bug.cgi?id=80812
Patch by Ming Xie <[email protected]> on 2012-03-12
Reviewed by Rob Buis.
* Scripts/build-webkit: Add $cmakeArgs to buildCMakeProjectOrExit()
* Scripts/webkitdirs.pm:
(blackberryCMakeArguments): Remove "PUBLIC_BUILD=0" define
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (110426 => 110427)
--- trunk/Tools/ChangeLog 2012-03-12 14:43:52 UTC (rev 110426)
+++ trunk/Tools/ChangeLog 2012-03-12 14:52:15 UTC (rev 110427)
@@ -1,3 +1,15 @@
+2012-03-12 Ming Xie <[email protected]>
+
+ [BlackBerry] build-webkit doesn't recognize "--cmakearg" for the BlackBerry port
+ https://bugs.webkit.org/show_bug.cgi?id=80812
+
+ Reviewed by Rob Buis.
+
+ * Scripts/build-webkit: Add $cmakeArgs to buildCMakeProjectOrExit()
+ * Scripts/webkitdirs.pm:
+ (blackberryCMakeArguments): Remove "PUBLIC_BUILD=0" define
+
+
2012-03-12 Simon Hausmann <[email protected]>
[Qt] Fix build with newer Qt 5.
Modified: trunk/Tools/Scripts/build-webkit (110426 => 110427)
--- trunk/Tools/Scripts/build-webkit 2012-03-12 14:43:52 UTC (rev 110426)
+++ trunk/Tools/Scripts/build-webkit 2012-03-12 14:52:15 UTC (rev 110427)
@@ -678,7 +678,7 @@
}
$makeArgs .= ($makeArgs ? " " : "") . "-j" . $numberOfJobs if $makeArgs !~ /-j\s*\d+/;
$prefixPath = $ENV{"STAGE_DIR"} unless $prefixPath;
- buildCMakeProjectOrExit($clean, "BlackBerry", $prefixPath, $makeArgs, (cmakeBasedPortArguments(), cMakeArgsFromFeatures()));
+ buildCMakeProjectOrExit($clean, "BlackBerry", $prefixPath, $makeArgs, (cmakeBasedPortArguments(), cMakeArgsFromFeatures()), $cmakeArgs);
}
if (isQt()) {
Modified: trunk/Tools/Scripts/webkitdirs.pm (110426 => 110427)
--- trunk/Tools/Scripts/webkitdirs.pm 2012-03-12 14:43:52 UTC (rev 110426)
+++ trunk/Tools/Scripts/webkitdirs.pm 2012-03-12 14:52:15 UTC (rev 110427)
@@ -979,7 +979,6 @@
}
my @cmakeArgs;
- push @cmakeArgs, "-DPUBLIC_BUILD=0";
push @cmakeArgs, '-DCMAKE_SYSTEM_NAME="QNX"';
push @cmakeArgs, "-DCMAKE_SYSTEM_PROCESSOR=\"$cpuDir\"";
push @cmakeArgs, '-DCMAKE_SYSTEM_VERSION="1"';
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
