Changeset 193618 in webkit


Ignore:
Timestamp:
Dec 7, 2015 3:01:10 AM (8 years ago)
Author:
Michael Catanzaro
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:
Location:
trunk/Tools
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Tools/ChangeLog

    r193617 r193618  
     12015-12-07  Michael Catanzaro  <mcatanzaro@igalia.com>
     2
     3        [GTK] update-webkitgtk-libs cannot build mesa
     4        https://bugs.webkit.org/show_bug.cgi?id=151535
     5
     6        Reviewed by Martin Robinson.
     7
     8        Upgrade to newer mesa in order to build successfully against LLVM 3.7. Add missing
     9        dependency of mesa on LLVM, to ensure LLVM is built first. Build LLVM unconditionally, even
     10        on architectures where FTL is not supported, to ensure mesa is always buildable, since LLVM
     11        does not have a stable API and we cannot expect mesa to be buildable unless we control the
     12        LLVM version. Build mesa with --disable-egl since --enable-egl conflicts with
     13        --enable-xlib-glx. This fixes update-webkitgtk-libs on distros with LLVM 3.7.
     14
     15        * gtk/jhbuild.modules:
     16
    1172015-12-07  Philippe Normand  <pnormand@igalia.com>
    218
  • trunk/Tools/gtk/jhbuild.modules

    r192780 r193618  
    3434      <dep package="openwebrtc"/>
    3535      <dep package="libseccomp"/>
    36       <if condition-set="x86_64">
    37         <dep package="llvm"/>
    38       </if>
     36      <dep package="llvm"/>
    3937    </dependencies>
    4038  </metamodule>
     
    369367  </autotools>
    370368
    371   <autotools id="mesa" autogenargs="--enable-xlib-glx --disable-dri --with-gallium-drivers=swrast" skip-install="true">
     369  <autotools id="mesa" autogenargs="--enable-xlib-glx --disable-dri --disable-egl --with-gallium-drivers=swrast" skip-install="true">
    372370    <!--- WARNING: At jhbuildrc, when we define the path to the Gallium llvmpipe software rasterizer (needed by XvfbDriver),
    373371          we assume that the directory is named "Mesa". So, don't change the checkoutdir name even if you update the version.  -->
    374     <branch module="/~brianp/mesa/10.5.4/mesa-10.5.4.tar.xz" version="10.5.4"
     372    <branch module="/~brianp/mesa/11.0.6/mesa-11.0.6.tar.xz" version="11.0.6"
    375373            checkoutdir="Mesa"
    376374            repo="people.freedesktop.org"
    377             hash="sha256:b51e723f3a20d842c88a92d809435b229fc4744ca0dbec0317d9d4a3ac4c6803">
    378     </branch>
     375            hash="sha256:8340e64cdc91999840404c211496f3de38e7b4cb38db34e2f72f1642c5134760">
     376    </branch>
     377    <dependencies>
     378      <dep package="llvm"/>
     379    </dependencies>
    379380  </autotools>
    380381
Note: See TracChangeset for help on using the changeset viewer.