Title: [101823] trunk/Tools
- Revision
- 101823
- Author
- [email protected]
- Date
- 2011-12-02 10:30:58 -0800 (Fri, 02 Dec 2011)
Log Message
Build fix. Use internal pcre on glib, make gnutls a dependency of
glib-networking, unset AR_FLAGS for jhbuild builds, and run jhbuild
in non-interactive mode.
* Scripts/update-webkitgtk-libs:
* gtk/jhbuild.modules:
* gtk/run-with-jhbuild:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (101822 => 101823)
--- trunk/Tools/ChangeLog 2011-12-02 18:26:31 UTC (rev 101822)
+++ trunk/Tools/ChangeLog 2011-12-02 18:30:58 UTC (rev 101823)
@@ -1,3 +1,13 @@
+2011-12-02 Gustavo Noronha Silva <[email protected]>
+
+ Build fix. Use internal pcre on glib, make gnutls a dependency of
+ glib-networking, unset AR_FLAGS for jhbuild builds, and run jhbuild
+ in non-interactive mode.
+
+ * Scripts/update-webkitgtk-libs:
+ * gtk/jhbuild.modules:
+ * gtk/run-with-jhbuild:
+
2011-12-02 Adam Roben <[email protected]>
Fix for Python 2.6
Modified: trunk/Tools/Scripts/update-webkitgtk-libs (101822 => 101823)
--- trunk/Tools/Scripts/update-webkitgtk-libs 2011-12-02 18:26:31 UTC (rev 101822)
+++ trunk/Tools/Scripts/update-webkitgtk-libs 2011-12-02 18:30:58 UTC (rev 101823)
@@ -19,6 +19,8 @@
use lib $FindBin::Bin;
use webkitdirs;
+delete $ENV{AR_FLAGS} if exists $ENV{AR_FLAGS};
+
chdir(relativeScriptsDir() . "/../gtk") or die $!;
print "Updating GTK+ port dependencies using jhbuild...\n";
Modified: trunk/Tools/gtk/jhbuild.modules (101822 => 101823)
--- trunk/Tools/gtk/jhbuild.modules 2011-12-02 18:26:31 UTC (rev 101822)
+++ trunk/Tools/gtk/jhbuild.modules 2011-12-02 18:30:58 UTC (rev 101823)
@@ -9,7 +9,6 @@
<dep package="freetype6"/>
<dep package="glib"/>
<dep package="glib-networking"/>
- <dep package="gnutls"/>
<dep package="libsoup"/>
</dependencies>
</metamodule>
@@ -38,7 +37,7 @@
md5sum="647ee8ed266f9a4117c8d0a4855b3d3e"/>
</tarball>
- <autotools id="glib" autogenargs="--with-pcre=system">
+ <autotools id="glib">
<branch module="/pub/GNOME/sources/glib/2.31/glib-2.31.2.tar.xz" version="2.31.2"
repo="gnome.org"
hash="sha256:19d7921671a487c3c5759a57df7b8508afdbadd7764d62a47a82fff7b399032b"
@@ -46,6 +45,9 @@
</autotools>
<autotools id="glib-networking">
+ <dependencies>
+ <dep package="gnutls"/>
+ </dependencies>
<branch module="/pub/GNOME/sources/glib-networking/2.31/glib-networking-2.31.2.tar.xz" version="2.31.2"
repo="gnome.org"
hash="sha256:03e3a2881d2626d1206e72972531661037fe0d32e745bf9b2f63c0d6f5e32a9c"
Modified: trunk/Tools/gtk/run-with-jhbuild (101822 => 101823)
--- trunk/Tools/gtk/run-with-jhbuild 2011-12-02 18:26:31 UTC (rev 101822)
+++ trunk/Tools/gtk/run-with-jhbuild 2011-12-02 18:30:58 UTC (rev 101823)
@@ -55,7 +55,7 @@
if not os.path.exists(jhbuild_path):
install_and_run_jhbuild()
-process = subprocess.Popen([jhbuild_path, '-f', common.top_level_path('Tools', 'gtk', 'jhbuildrc'), 'run'] + sys.argv[1:])
+process = subprocess.Popen([jhbuild_path, '--no-interact', '-f', common.top_level_path('Tools', 'gtk', 'jhbuildrc'), 'run'] + sys.argv[1:])
process.wait()
sys.exit(process.returncode)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
