Changeset 262063 in webkit

Timestamp:

May 22, 2020 10:35:43 AM (4 years ago)

Author:

ChangSeok Oh

Message:

[GTK] jhbuild is broken with GCC 10.0
​https://bugs.webkit.org/show_bug.cgi?id=212256

Reviewed by Carlos Alberto Lopez Perez.

GCC 10.0 enables -fno-common as default, so many 'multiple definitions' failures occur
in building dependencies via jhbuild. This patch addresses them by back-porting patches
from corresponding source repositories.

• gstreamer/jhbuild.modules:
• gstreamer/patches/libsrtp-Fix-building-with-gcc-10.patch: Added.
• gstreamer/patches/orc-satisfy-fno-common-under-gcc10.patch: Added.
• gtk/jhbuild.modules:
• gtk/patches/at-spi2-atk-tests-Replace-common-variable-with-usual-external.patch: Added.
• gtk/patches/at-spi2-atk-tests-fix-child_pid-reference.patch: Added.
• gtk/patches/mesa-gallium-build-fix-to-make-gcc-10-happy.patch: Added.
• gtk/patches/xserver-Fix-building-with-fno-common.patch: Added.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• gstreamer/jhbuild.modules (modified) (2 diffs)
• gstreamer/patches/libsrtp-Fix-building-with-gcc-10.patch (added)
• gstreamer/patches/orc-satisfy-fno-common-under-gcc10.patch (added)
• gtk/jhbuild.modules (modified) (3 diffs)
• gtk/patches/at-spi2-atk-tests-Replace-common-variable-with-usual-external.patch (added)
• gtk/patches/at-spi2-atk-tests-fix-child_pid-reference.patch (added)
• gtk/patches/mesa-gallium-build-fix-to-make-gcc-10-happy.patch (added)
• gtk/patches/xserver-Fix-building-with-fno-common.patch (added)

trunk/Tools/ChangeLog

@@ +1 @@
+2020-05-22  ChangSeok Oh  <changseok@webkit.org>
+
+        [GTK] jhbuild is broken with GCC 10.0
+        https://bugs.webkit.org/show_bug.cgi?id=212256
+
+        Reviewed by Carlos Alberto Lopez Perez.
+
+        GCC 10.0 enables -fno-common as default, so many 'multiple definitions' failures occur
+        in building dependencies via jhbuild. This patch addresses them by back-porting patches
+        from corresponding source repositories.
+
+        * gstreamer/jhbuild.modules:
+        * gstreamer/patches/libsrtp-Fix-building-with-gcc-10.patch: Added.
+        * gstreamer/patches/orc-satisfy-fno-common-under-gcc10.patch: Added.
+        * gtk/jhbuild.modules:
+        * gtk/patches/at-spi2-atk-tests-Replace-common-variable-with-usual-external.patch: Added.
+        * gtk/patches/at-spi2-atk-tests-fix-child_pid-reference.patch: Added.
+        * gtk/patches/mesa-gallium-build-fix-to-make-gcc-10-happy.patch: Added.
+        * gtk/patches/xserver-Fix-building-with-fno-common.patch: Added.
+
 2020-05-22  Philippe Normand  <pnormand@igalia.com>
 

trunk/Tools/gstreamer/jhbuild.modules

@@ -29 +29 @@
     <branch module="orc/orc-${version}.tar.xz" version="0.4.30"
             repo="gstreamer"
-            hash="sha256:ba41b92146a5691cd102eb79c026757d39e9d3b81a65810d2946a1786a1c4972"/>
+            hash="sha256:ba41b92146a5691cd102eb79c026757d39e9d3b81a65810d2946a1786a1c4972">
+      <patch file="orc-satisfy-fno-common-under-gcc10.patch" strip="1"/>
+    </branch>
   </meson>
 
@@ -46 +48 @@
   <autotools id="libsrtp">
     <branch repo="github-tarball" module="cisco/libsrtp/archive/v${version}.tar.gz" version="2.2.0"
-            checkoutdir="libsrtp-${version}"/>
+            checkoutdir="libsrtp-${version}">
+      <patch file="libsrtp-Fix-building-with-gcc-10.patch" strip="1"/>
+    </branch>
   </autotools>
 

trunk/Tools/gtk/jhbuild.modules

@@ -293 +293 @@
             repo="ftp.gnome.org"
             hash="sha256:64d4351b245d717ec6f4f81fd40fe67481ff8e62d3893d465f01e71d9a3db3d3">
+      <patch file="at-spi2-atk-tests-Replace-common-variable-with-usual-external.patch" strip="1"/>
+      <patch file="at-spi2-atk-tests-fix-child_pid-reference.patch" strip="1"/>
     </branch>
     <dependencies>
@@ -320 +322 @@
       <patch file="xserver-search-for-DRI-drivers-at-LIBGL_DRIVERS_PATH-environ.patch" strip="1"/>
       <patch file="xserver-gl-version.patch" strip="1"/> <!-- This patch does not include the meson build fix -->
+      <patch file="xserver-Fix-building-with-fno-common.patch" strip="1"/>
     </branch>
   </autotools>
@@ -377 +380 @@
             repo="mesa.freedesktop.org"
             hash="sha256:099d9667327a76a61741a533f95067d76ea71a656e66b91507b3c0caf1d49e30">
+      <patch file="mesa-gallium-build-fix-to-make-gcc-10-happy.patch" strip="1"/>
     </branch>
     <dependencies>