[Buildroot] [PATCH 0/3] Disable brotli for Microblaze and propagate dependecies

[Buildroot] [PATCH 0/3] Disable brotli for Microblaze and propagate dependecies

[Adrian Perez de Castro]

Hello,

As discussed on the mailing list, here's a patch set to disable the
brotli package on Microblaze because it triggers a compiler bug. Only
libcurl uses it optionally, and the other direct user is woff2, which
itself is only needed by webkitgtk. Luckily, there is a build option
to disable WOFF2 support, so this disables the feature only for the
Microblaze architecture.

Adrian Perez de Castro (3):
  package/brotli: disable for microblaze
  package/woff2: propagate microblaze dependecy
  package/webkitgtk: propagate microblaze dependency

 package/brotli/Config.in       |  5 +++++
 package/webkitgtk/Config.in    |  2 +-
 package/webkitgtk/webkitgtk.mk | 12 +++++++++---
 package/woff2/Config.in        |  1 +
 4 files changed, 16 insertions(+), 4 deletions(-)

-- 
2.20.1

[Buildroot] [PATCH 1/3] package/brotli: disable for microblaze

[Adrian Perez de Castro]

The brotli package cannot be currently built due to a compiler bug. Not
many packages use it so the impact of disabling it for Microblaze will
be small: only libcurl and woff2 use it; and woff2 is used by webkitgtk
which itself can be built without the woff2 support.

This fixes the following autobuilder failure:

  http://autobuild.buildroot.net/results/1b6e6c5fddf3538ed7f150294c3d8fa94b3e4c59/

Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
---
 package/brotli/Config.in | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/package/brotli/Config.in b/package/brotli/Config.in
index e40f5b6b9f..f2a4bdd8e9 100644
--- a/package/brotli/Config.in
+++ b/package/brotli/Config.in
@@ -1,5 +1,10 @@
 config BR2_PACKAGE_BROTLI
 	bool "brotli"
+	# Building on Microblaze is currently broken due to the following
+	# GCC bugs, which affect all versions currently available:
+	#   - https://gcc.gnu.org/bugzilla/show_bug.cgi?id=78380
+	#   - https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69401
+	depends on !BR2_microblaze
 	help
 	  Generic-purpose lossless compression library. The algorithm
 	  compresses data using a combination of a modern variant of
-- 
2.20.1

[Buildroot] [PATCH 2/3] package/woff2: propagate microblaze dependecy

[Adrian Perez de Castro]

The brotli package is disabled for Microblaze, therefore disable
woff2 as well for the architecture.

Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
---
 package/woff2/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/woff2/Config.in b/package/woff2/Config.in
index 48672570dd..f451c04984 100644
--- a/package/woff2/Config.in
+++ b/package/woff2/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_WOFF2
 	bool "woff2"
+	depends on !BR2_microblaze # brotli
 	depends on BR2_INSTALL_LIBSTDCPP
 	select BR2_PACKAGE_BROTLI
 	help
-- 
2.20.1

[Buildroot] [PATCH 3/3] package/webkitgtk: propagate microblaze dependency

[Adrian Perez de Castro]

The woff2 package is disabled for Microblaze, therefore disable
the support for WOFF2 web fonts in webkitgtk and make it optional.
Note that the support for other web fonts formats (OTF, TTF, WOFF1)
will still work normally and only WOFF2 gets disabled.

Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
---
 package/webkitgtk/Config.in    |  2 +-
 package/webkitgtk/webkitgtk.mk | 12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/package/webkitgtk/Config.in b/package/webkitgtk/Config.in
index 8714677b6a..2f466a37d4 100644
--- a/package/webkitgtk/Config.in
+++ b/package/webkitgtk/Config.in
@@ -59,7 +59,7 @@ config BR2_PACKAGE_WEBKITGTK
 	select BR2_PACKAGE_SQLITE
 	select BR2_PACKAGE_WEBP
 	select BR2_PACKAGE_WEBP_DEMUX
-	select BR2_PACKAGE_WOFF2
+	select BR2_PACKAGE_WOFF2 if !BR2_microblaze # woff2 -> brotli
 	select BR2_PACKAGE_XLIB_LIBXCOMPOSITE if BR2_PACKAGE_LIBGTK3_X11
 	select BR2_PACKAGE_XLIB_LIBXDAMAGE if BR2_PACKAGE_LIBGTK3_X11
 	select BR2_PACKAGE_XLIB_LIBXRENDER if BR2_PACKAGE_LIBGTK3_X11
diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk
index c17bbc8028..54159d7f47 100644
--- a/package/webkitgtk/webkitgtk.mk
+++ b/package/webkitgtk/webkitgtk.mk
@@ -14,7 +14,7 @@ WEBKITGTK_LICENSE_FILES = \
 	Source/WebCore/LICENSE-LGPL-2.1
 WEBKITGTK_DEPENDENCIES = host-ruby host-python host-gperf \
 	enchant harfbuzz icu jpeg libgcrypt libgtk3 libsecret libsoup \
-	libtasn1 libxml2 libxslt sqlite webp woff2
+	libtasn1 libxml2 libxslt sqlite webp
 WEBKITGTK_CONF_OPTS = \
 	-DENABLE_API_TESTS=OFF \
 	-DENABLE_GEOLOCATION=OFF \
@@ -24,8 +24,7 @@ WEBKITGTK_CONF_OPTS = \
 	-DENABLE_SPELLCHECK=ON \
 	-DPORT=GTK \
 	-DUSE_LIBNOTIFY=OFF \
-	-DUSE_LIBHYPHEN=OFF \
-	-DUSE_WOFF2=ON
+	-DUSE_LIBHYPHEN=OFF
 
 ifeq ($(BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS_JIT),y)
 WEBKITGTK_CONF_OPTS += -DENABLE_JIT=ON
@@ -98,4 +97,11 @@ else
 WEBKITGTK_CONF_OPTS += -DUSE_GSTREAMER_GL=OFF
 endif
 
+ifeq ($(BR2_PACKAGE_WOFF2),y)
+WEBKITGTK_CONF_OPTS += -DUSE_WOFF2=ON
+WEBKITGTK_DEPENDENCIES += woff2
+else
+WEBKITGTK_CONF_OPTS += -DUSE_WOFF2=OFF
+endif
+
 $(eval $(cmake-package))
-- 
2.20.1

[Buildroot] [PATCH 3/3] package/webkitgtk: propagate microblaze dependency

[Arnout Vandecappelle]

 Hi Adrian,

On 16/02/2019 14:45, Adrian Perez de Castro wrote:
> The woff2 package is disabled for Microblaze, therefore disable
> the support for WOFF2 web fonts in webkitgtk and make it optional.
> Note that the support for other web fonts formats (OTF, TTF, WOFF1)
> will still work normally and only WOFF2 gets disabled.

 This patch conflicts with your series refactoring the webkit packages...

 I think the proper approach is.

1. Patch for webkitgtk to make woff2 an optional dependency (i.e., [1] but
without the refactoring, so duplicate work for the two webkits). To be applied
to master.

2. Patches 1+2 of this series, but squashed (when you add a dependency to a
package, you have to propagate it in the same commit, otherwise it's not
bisectable). For master, obviously.

3-5 The rest of the RFC series, for next.


> 
> Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
> ---
>  package/webkitgtk/Config.in    |  2 +-
>  package/webkitgtk/webkitgtk.mk | 12 +++++++++---
>  2 files changed, 10 insertions(+), 4 deletions(-)
> 
> diff --git a/package/webkitgtk/Config.in b/package/webkitgtk/Config.in
> index 8714677b6a..2f466a37d4 100644
> --- a/package/webkitgtk/Config.in
> +++ b/package/webkitgtk/Config.in
> @@ -59,7 +59,7 @@ config BR2_PACKAGE_WEBKITGTK
>  	select BR2_PACKAGE_SQLITE
>  	select BR2_PACKAGE_WEBP
>  	select BR2_PACKAGE_WEBP_DEMUX
> -	select BR2_PACKAGE_WOFF2
> +	select BR2_PACKAGE_WOFF2 if !BR2_microblaze # woff2 -> brotli

 If woff2 is optional, then this should be removed entirely. That is also
missing in [1].

 Regards,
 Arnout


[1] http://patchwork.ozlabs.org/patch/1044194/

>  	select BR2_PACKAGE_XLIB_LIBXCOMPOSITE if BR2_PACKAGE_LIBGTK3_X11
>  	select BR2_PACKAGE_XLIB_LIBXDAMAGE if BR2_PACKAGE_LIBGTK3_X11
>  	select BR2_PACKAGE_XLIB_LIBXRENDER if BR2_PACKAGE_LIBGTK3_X11
> diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk
> index c17bbc8028..54159d7f47 100644
> --- a/package/webkitgtk/webkitgtk.mk
> +++ b/package/webkitgtk/webkitgtk.mk
> @@ -14,7 +14,7 @@ WEBKITGTK_LICENSE_FILES = \
>  	Source/WebCore/LICENSE-LGPL-2.1
>  WEBKITGTK_DEPENDENCIES = host-ruby host-python host-gperf \
>  	enchant harfbuzz icu jpeg libgcrypt libgtk3 libsecret libsoup \
> -	libtasn1 libxml2 libxslt sqlite webp woff2
> +	libtasn1 libxml2 libxslt sqlite webp
>  WEBKITGTK_CONF_OPTS = \
>  	-DENABLE_API_TESTS=OFF \
>  	-DENABLE_GEOLOCATION=OFF \
> @@ -24,8 +24,7 @@ WEBKITGTK_CONF_OPTS = \
>  	-DENABLE_SPELLCHECK=ON \
>  	-DPORT=GTK \
>  	-DUSE_LIBNOTIFY=OFF \
> -	-DUSE_LIBHYPHEN=OFF \
> -	-DUSE_WOFF2=ON
> +	-DUSE_LIBHYPHEN=OFF
>  
>  ifeq ($(BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS_JIT),y)
>  WEBKITGTK_CONF_OPTS += -DENABLE_JIT=ON
> @@ -98,4 +97,11 @@ else
>  WEBKITGTK_CONF_OPTS += -DUSE_GSTREAMER_GL=OFF
>  endif
>  
> +ifeq ($(BR2_PACKAGE_WOFF2),y)
> +WEBKITGTK_CONF_OPTS += -DUSE_WOFF2=ON
> +WEBKITGTK_DEPENDENCIES += woff2
> +else
> +WEBKITGTK_CONF_OPTS += -DUSE_WOFF2=OFF
> +endif
> +
>  $(eval $(cmake-package))
> 

[Buildroot] [PATCH 3/3] package/webkitgtk: propagate microblaze dependency

[Adrian Perez de Castro]

Hello Arnout,

On Tue, 19 Feb 2019 23:25:14 +0100, Arnout Vandecappelle <arnout@mind.be> wrote:
 
> On 16/02/2019 14:45, Adrian Perez de Castro wrote:
> > The woff2 package is disabled for Microblaze, therefore disable
> > the support for WOFF2 web fonts in webkitgtk and make it optional.
> > Note that the support for other web fonts formats (OTF, TTF, WOFF1)
> > will still work normally and only WOFF2 gets disabled.
> 
>  This patch conflicts with your series refactoring the webkit packages...

Yep, that's why I sent it as [RFC], to have an idea of how would it be
good to proceed, and some other pair of eyes take an initial look at the
patch series for the WebKit packages. Thanks for reviewing them!

>  I think the proper approach is.
> 
> 1. Patch for webkitgtk to make woff2 an optional dependency (i.e., [1] but
> without the refactoring, so duplicate work for the two webkits). To be applied
> to master.
> 
> 2. Patches 1+2 of this series, but squashed (when you add a dependency to a
> package, you have to propagate it in the same commit, otherwise it's not
> bisectable). For master, obviously.
> 
> 3-5 The rest of the RFC series, for next.

Sounds like a very sensible approach, I'll rework thing as you suggest.

Thanks again!

-Adri?n

> > Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
> > ---
> >  package/webkitgtk/Config.in    |  2 +-
> >  package/webkitgtk/webkitgtk.mk | 12 +++++++++---
> >  2 files changed, 10 insertions(+), 4 deletions(-)
> > 
> > diff --git a/package/webkitgtk/Config.in b/package/webkitgtk/Config.in
> > index 8714677b6a..2f466a37d4 100644
> > --- a/package/webkitgtk/Config.in
> > +++ b/package/webkitgtk/Config.in
> > @@ -59,7 +59,7 @@ config BR2_PACKAGE_WEBKITGTK
> >  	select BR2_PACKAGE_SQLITE
> >  	select BR2_PACKAGE_WEBP
> >  	select BR2_PACKAGE_WEBP_DEMUX
> > -	select BR2_PACKAGE_WOFF2
> > +	select BR2_PACKAGE_WOFF2 if !BR2_microblaze # woff2 -> brotli
> 
>  If woff2 is optional, then this should be removed entirely. That is also
> missing in [1].
> 
>  Regards,
>  Arnout
> 
> 
> [1] http://patchwork.ozlabs.org/patch/1044194/
> 
> >  	select BR2_PACKAGE_XLIB_LIBXCOMPOSITE if BR2_PACKAGE_LIBGTK3_X11
> >  	select BR2_PACKAGE_XLIB_LIBXDAMAGE if BR2_PACKAGE_LIBGTK3_X11
> >  	select BR2_PACKAGE_XLIB_LIBXRENDER if BR2_PACKAGE_LIBGTK3_X11
> > diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk
> > index c17bbc8028..54159d7f47 100644
> > --- a/package/webkitgtk/webkitgtk.mk
> > +++ b/package/webkitgtk/webkitgtk.mk
> > @@ -14,7 +14,7 @@ WEBKITGTK_LICENSE_FILES = \
> >  	Source/WebCore/LICENSE-LGPL-2.1
> >  WEBKITGTK_DEPENDENCIES = host-ruby host-python host-gperf \
> >  	enchant harfbuzz icu jpeg libgcrypt libgtk3 libsecret libsoup \
> > -	libtasn1 libxml2 libxslt sqlite webp woff2
> > +	libtasn1 libxml2 libxslt sqlite webp
> >  WEBKITGTK_CONF_OPTS = \
> >  	-DENABLE_API_TESTS=OFF \
> >  	-DENABLE_GEOLOCATION=OFF \
> > @@ -24,8 +24,7 @@ WEBKITGTK_CONF_OPTS = \
> >  	-DENABLE_SPELLCHECK=ON \
> >  	-DPORT=GTK \
> >  	-DUSE_LIBNOTIFY=OFF \
> > -	-DUSE_LIBHYPHEN=OFF \
> > -	-DUSE_WOFF2=ON
> > +	-DUSE_LIBHYPHEN=OFF
> >  
> >  ifeq ($(BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS_JIT),y)
> >  WEBKITGTK_CONF_OPTS += -DENABLE_JIT=ON
> > @@ -98,4 +97,11 @@ else
> >  WEBKITGTK_CONF_OPTS += -DUSE_GSTREAMER_GL=OFF
> >  endif
> >  
> > +ifeq ($(BR2_PACKAGE_WOFF2),y)
> > +WEBKITGTK_CONF_OPTS += -DUSE_WOFF2=ON
> > +WEBKITGTK_DEPENDENCIES += woff2
> > +else
> > +WEBKITGTK_CONF_OPTS += -DUSE_WOFF2=OFF
> > +endif
> > +
> >  $(eval $(cmake-package))
> > 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 195 bytes
Desc: not available
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20190222/f01568ee/attachment.asc>