Title: [201726] trunk/Tools
- Revision
- 201726
- Author
- clo...@igalia.com
- Date
- 2016-06-06 13:34:07 -0700 (Mon, 06 Jun 2016)
Log Message
REGRESSION(r201449) [GTK] ARMv7 build fails with libicudata.so.55: cannot open shared object file on gtkdoc-scangobj step.
https://bugs.webkit.org/show_bug.cgi?id=158417
Reviewed by Michael Catanzaro.
The toolchain on armhf (ARMv7) seems unable to properly handle
a shared library that doesn't link with anything.
And libicudata is built by default in this way because it only
contains static data.
That makes icu unusable on armhf because the linker will be
unable to resolve the libicudata dependencies.
Most (if not all) distributions workaround this by linking
libicudata with libc6, which is already a needed dependency for
any of the other icu shared libraries.
So import here the Debian patch fixing this issue. For further
details check https://bugs.debian.org/653457
* gtk/jhbuild.modules:
* gtk/patches/icudata-stdlibs.patch: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/Tools/ChangeLog (201725 => 201726)
--- trunk/Tools/ChangeLog 2016-06-06 20:33:39 UTC (rev 201725)
+++ trunk/Tools/ChangeLog 2016-06-06 20:34:07 UTC (rev 201726)
@@ -1,3 +1,29 @@
+2016-06-06 Carlos Alberto Lopez Perez <clo...@igalia.com>
+
+ REGRESSION(r201449) [GTK] ARMv7 build fails with libicudata.so.55: cannot open shared object file on gtkdoc-scangobj step.
+ https://bugs.webkit.org/show_bug.cgi?id=158417
+
+ Reviewed by Michael Catanzaro.
+
+ The toolchain on armhf (ARMv7) seems unable to properly handle
+ a shared library that doesn't link with anything.
+
+ And libicudata is built by default in this way because it only
+ contains static data.
+
+ That makes icu unusable on armhf because the linker will be
+ unable to resolve the libicudata dependencies.
+
+ Most (if not all) distributions workaround this by linking
+ libicudata with libc6, which is already a needed dependency for
+ any of the other icu shared libraries.
+
+ So import here the Debian patch fixing this issue. For further
+ details check https://bugs.debian.org/653457
+
+ * gtk/jhbuild.modules:
+ * gtk/patches/icudata-stdlibs.patch: Added.
+
2016-06-06 Per Arne Vollan <pvol...@apple.com>
REGRESSION (r104174): 500+ tests failing on Windows
Modified: trunk/Tools/gtk/jhbuild.modules (201725 => 201726)
--- trunk/Tools/gtk/jhbuild.modules 2016-06-06 20:33:39 UTC (rev 201725)
+++ trunk/Tools/gtk/jhbuild.modules 2016-06-06 20:34:07 UTC (rev 201726)
@@ -496,6 +496,7 @@
<branch module="icu4c-55_1-src.tgz" version="55.1" checkoutdir="icu"
repo="webkitgtk-jhbuild-mirror"
hash="sha256:e16b22cbefdd354bec114541f7849a12f8fc2015320ca5282ee4fd787571457b">
+ <patch file="icudata-stdlibs.patch" strip="1"/>
</branch>
</autotools>
Added: trunk/Tools/gtk/patches/icudata-stdlibs.patch (0 => 201726)
--- trunk/Tools/gtk/patches/icudata-stdlibs.patch (rev 0)
+++ trunk/Tools/gtk/patches/icudata-stdlibs.patch 2016-06-06 20:34:07 UTC (rev 201726)
@@ -0,0 +1,15 @@
+Index: icu-52~m1/source/config/mh-linux
+===================================================================
+--- icu-52~m1.orig/source/config/mh-linux 2013-09-14 18:53:23.284040467 -0400
++++ icu-52~m1/source/config/mh-linux 2013-09-14 18:53:23.284040467 -0400
+@@ -21,7 +21,9 @@
+ LD_RPATH_PRE = -Wl,-rpath,
+
+ ## These are the library specific LDFLAGS
+-LDFLAGSICUDT=-nodefaultlibs -nostdlib
++#LDFLAGSICUDT=-nodefaultlibs -nostdlib
++# Debian change: linking icudata as data only causes too many problems.
++LDFLAGSICUDT=
+
+ ## Compiler switch to embed a library name
+ # The initial tab in the next line is to prevent icu-config from reading it.
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
