Title: [193618] trunk/Tools
- Revision
- 193618
- Author
- mcatanz...@igalia.com
- Date
- 2015-12-07 03:01:10 -0800 (Mon, 07 Dec 2015)
Log Message
[GTK] update-webkitgtk-libs cannot build mesa
https://bugs.webkit.org/show_bug.cgi?id=151535
Reviewed by Martin Robinson.
Upgrade to newer mesa in order to build successfully against LLVM 3.7. Add missing
dependency of mesa on LLVM, to ensure LLVM is built first. Build LLVM unconditionally, even
on architectures where FTL is not supported, to ensure mesa is always buildable, since LLVM
does not have a stable API and we cannot expect mesa to be buildable unless we control the
LLVM version. Build mesa with --disable-egl since --enable-egl conflicts with
--enable-xlib-glx. This fixes update-webkitgtk-libs on distros with LLVM 3.7.
* gtk/jhbuild.modules:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (193617 => 193618)
--- trunk/Tools/ChangeLog 2015-12-07 09:11:30 UTC (rev 193617)
+++ trunk/Tools/ChangeLog 2015-12-07 11:01:10 UTC (rev 193618)
@@ -1,3 +1,19 @@
+2015-12-07 Michael Catanzaro <mcatanz...@igalia.com>
+
+ [GTK] update-webkitgtk-libs cannot build mesa
+ https://bugs.webkit.org/show_bug.cgi?id=151535
+
+ Reviewed by Martin Robinson.
+
+ Upgrade to newer mesa in order to build successfully against LLVM 3.7. Add missing
+ dependency of mesa on LLVM, to ensure LLVM is built first. Build LLVM unconditionally, even
+ on architectures where FTL is not supported, to ensure mesa is always buildable, since LLVM
+ does not have a stable API and we cannot expect mesa to be buildable unless we control the
+ LLVM version. Build mesa with --disable-egl since --enable-egl conflicts with
+ --enable-xlib-glx. This fixes update-webkitgtk-libs on distros with LLVM 3.7.
+
+ * gtk/jhbuild.modules:
+
2015-12-07 Philippe Normand <pnorm...@igalia.com>
[GTK][Mac] libWebExtensionTest link error
Modified: trunk/Tools/gtk/jhbuild.modules (193617 => 193618)
--- trunk/Tools/gtk/jhbuild.modules 2015-12-07 09:11:30 UTC (rev 193617)
+++ trunk/Tools/gtk/jhbuild.modules 2015-12-07 11:01:10 UTC (rev 193618)
@@ -33,9 +33,7 @@
<dep package="mesa"/>
<dep package="openwebrtc"/>
<dep package="libseccomp"/>
- <if condition-set="x86_64">
- <dep package="llvm"/>
- </if>
+ <dep package="llvm"/>
</dependencies>
</metamodule>
@@ -368,14 +366,17 @@
hash="sha256:3e6ecf134dbf92a74c24d79848fea3a48e59ab95408a38c6405905d95a293011"/>
</autotools>
- <autotools id="mesa" autogenargs="--enable-xlib-glx --disable-dri --with-gallium-drivers=swrast" skip-install="true">
+ <autotools id="mesa" autogenargs="--enable-xlib-glx --disable-dri --disable-egl --with-gallium-drivers=swrast" skip-install="true">
<!--- WARNING: At jhbuildrc, when we define the path to the Gallium llvmpipe software rasterizer (needed by XvfbDriver),
we assume that the directory is named "Mesa". So, don't change the checkoutdir name even if you update the version. -->
- <branch module="/~brianp/mesa/10.5.4/mesa-10.5.4.tar.xz" version="10.5.4"
+ <branch module="/~brianp/mesa/11.0.6/mesa-11.0.6.tar.xz" version="11.0.6"
checkoutdir="Mesa"
repo="people.freedesktop.org"
- hash="sha256:b51e723f3a20d842c88a92d809435b229fc4744ca0dbec0317d9d4a3ac4c6803">
+ hash="sha256:8340e64cdc91999840404c211496f3de38e7b4cb38db34e2f72f1642c5134760">
</branch>
+ <dependencies>
+ <dep package="llvm"/>
+ </dependencies>
</autotools>
<autotools id="libusrsctp" supports-non-srcdir-builds="no" autogen-sh="./bootstrap; ./configure --disable-warnings-as-errors">
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
