[Buildroot] [PATCH v2, 1/2] package/netsurf: fix build with BR2_OPTIMIZE_FAST

[Buildroot] [PATCH v2, 1/2] package/netsurf: fix build with BR2_OPTIMIZE_FAST

[Fabrice Fontaine]

Disable duktape with BR2_OPTIMIZE_FAST to fix the following build
failure:

In file included from content/handlers/javascript/duktape/duktape.h:195,
                 from build/Linux-framebuffer/duktape/application_cache.c:21:
content/handlers/javascript/duktape/duk_config.h:2861:2: error: #error __FAST_MATH__ defined, refusing to compile
 2861 | #error __FAST_MATH__ defined, refusing to compile
      |  ^~~~~

Fixes:
 - http://autobuild.buildroot.org/results/2f1b42e2be3aa76cbacd84f3d0ad8b13edce6982

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/netsurf/netsurf.mk | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/package/netsurf/netsurf.mk b/package/netsurf/netsurf.mk
index 1064698c12..574c1423df 100644
--- a/package/netsurf/netsurf.mk
+++ b/package/netsurf/netsurf.mk
@@ -14,6 +14,17 @@ NETSURF_CPE_ID_VENDOR = netsurf-browser
 NETSURF_DEPENDENCIES = expat jpeg libpng \
 	host-bison host-flex host-gperf host-pkgconf host-vim
 
+# internal duktape doesn't build with BR2_OPTIMIZE_FAST
+ifeq ($(BR2_OPTIMIZE_FAST),y)
+define NETSURF_DUKTAPE_CONFIGURE_CMDS
+	echo "override NETSURF_USE_DUKTAPE := NO"       >> $(@D)/netsurf/Makefile.config
+endef
+else
+define NETSURF_DUKTAPE_CONFIGURE_CMDS
+	echo "override NETSURF_USE_DUKTAPE := YES"      >> $(@D)/netsurf/Makefile.config
+endef
+endif
+
 ifeq ($(BR2_PACKAGE_NETSURF_GTK),y)
 NETSURF_DEPENDENCIES += libgtk2
 NETSURF_FRONTEND = gtk2
@@ -77,6 +88,7 @@ endef
 endif
 
 define NETSURF_CONFIGURE_CMDS
+	$(NETSURF_DUKTAPE_CONFIGURE_CMDS)
 	$(NETSURF_ICONV_CONFIGURE_CMDS)
 	$(NETSURF_SVG_CONFIGURE_CMDS)
 	$(NETSURF_FONTLIB_CONFIGURE_CMDS)
-- 
2.35.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH v2,2/2] package/netsurf: fix build with ccache

[Fabrice Fontaine]

Update second patch to fix the following build failure with ccache:

/home/autobuild/autobuild/instance-11/output-1/build/netsurf-3.10/tmpusr/share/netsurf-buildsystem/makefiles/Makefile.tools:413: *** Unable to detect toolchain.  Stop.

Fixes:
 - http://autobuild.buildroot.org/results/b4ba19d7dcff1b0ee2b1546598b5ae6e9257a16d

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
Changes v1 -> v2 (after review of Arnout Vandecappelle):
 - Update patch instead of using HOST_NOCCACHE)

 package/netsurf/0002-do-not-cross-compile-nsgenbind.patch | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/netsurf/0002-do-not-cross-compile-nsgenbind.patch b/package/netsurf/0002-do-not-cross-compile-nsgenbind.patch
index 2d4637511e..7caad47a20 100644
--- a/package/netsurf/0002-do-not-cross-compile-nsgenbind.patch
+++ b/package/netsurf/0002-do-not-cross-compile-nsgenbind.patch
@@ -8,6 +8,8 @@ the build, so it should not be built with the cross-compiler, but with
 the native compiler.
 
 Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
+[Fabrice: add quotes around BUILD_CC to fix build with ccache]
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
 ---
  Makefile | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
@@ -21,7 +23,7 @@ index f279f01..5698c87 100644
  # prefixed install macro for each host sub target
  define do_build_prefix_install
 -	$(MAKE) install --directory=$1 HOST=$(BUILD) PREFIX=$(TMP_PREFIX) Q=$(Q) DESTDIR=
-+	$(MAKE) install --directory=$1 HOST=$(BUILD) CC=$(BUILD_CC) PREFIX=$(TMP_PREFIX) Q=$(Q) DESTDIR=
++	$(MAKE) install --directory=$1 HOST=$(BUILD) CC="$(BUILD_CC)" PREFIX=$(TMP_PREFIX) Q=$(Q) DESTDIR=
  
  endef
  
-- 
2.35.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v2, 1/2] package/netsurf: fix build with BR2_OPTIMIZE_FAST

[Arnout Vandecappelle]

On 22/04/2022 23:21, Fabrice Fontaine wrote:
> Disable duktape with BR2_OPTIMIZE_FAST to fix the following build
> failure:
> 
> In file included from content/handlers/javascript/duktape/duktape.h:195,
>                   from build/Linux-framebuffer/duktape/application_cache.c:21:
> content/handlers/javascript/duktape/duk_config.h:2861:2: error: #error __FAST_MATH__ defined, refusing to compile
>   2861 | #error __FAST_MATH__ defined, refusing to compile
>        |  ^~~~~
> 
> Fixes:
>   - http://autobuild.buildroot.org/results/2f1b42e2be3aa76cbacd84f3d0ad8b13edce6982
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
>   package/netsurf/netsurf.mk | 12 ++++++++++++
>   1 file changed, 12 insertions(+)
> 
> diff --git a/package/netsurf/netsurf.mk b/package/netsurf/netsurf.mk
> index 1064698c12..574c1423df 100644
> --- a/package/netsurf/netsurf.mk
> +++ b/package/netsurf/netsurf.mk
> @@ -14,6 +14,17 @@ NETSURF_CPE_ID_VENDOR = netsurf-browser
>   NETSURF_DEPENDENCIES = expat jpeg libpng \
>   	host-bison host-flex host-gperf host-pkgconf host-vim
>   
> +# internal duktape doesn't build with BR2_OPTIMIZE_FAST
> +ifeq ($(BR2_OPTIMIZE_FAST),y)
> +define NETSURF_DUKTAPE_CONFIGURE_CMDS
> +	echo "override NETSURF_USE_DUKTAPE := NO"       >> $(@D)/netsurf/Makefile.config
> +endef
> +else
> +define NETSURF_DUKTAPE_CONFIGURE_CMDS
> +	echo "override NETSURF_USE_DUKTAPE := YES"      >> $(@D)/netsurf/Makefile.config
> +endef
> +endif

  Ideally we'd unbundle duktape of course. I took a look, doesn't look doable.

  Thing is, with this, based on optimisation option, you have netsurf with or 
without javascript support. Not exactly ideal. I think this should be a 
user-visible option then.

  Anyway, for now, applied to master, thanks.

  Regards,
  Arnout

> +
>   ifeq ($(BR2_PACKAGE_NETSURF_GTK),y)
>   NETSURF_DEPENDENCIES += libgtk2
>   NETSURF_FRONTEND = gtk2
> @@ -77,6 +88,7 @@ endef
>   endif
>   
>   define NETSURF_CONFIGURE_CMDS
> +	$(NETSURF_DUKTAPE_CONFIGURE_CMDS)
>   	$(NETSURF_ICONV_CONFIGURE_CMDS)
>   	$(NETSURF_SVG_CONFIGURE_CMDS)
>   	$(NETSURF_FONTLIB_CONFIGURE_CMDS)
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v2, 2/2] package/netsurf: fix build with ccache

[Arnout Vandecappelle]

On 22/04/2022 23:21, Fabrice Fontaine wrote:
> Update second patch to fix the following build failure with ccache:
> 
> /home/autobuild/autobuild/instance-11/output-1/build/netsurf-3.10/tmpusr/share/netsurf-buildsystem/makefiles/Makefile.tools:413: *** Unable to detect toolchain.  Stop.
> 
> Fixes:
>   - http://autobuild.buildroot.org/results/b4ba19d7dcff1b0ee2b1546598b5ae6e9257a16d
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

  Applied to master, thanks.

  Regards,
  Arnout

> ---
> Changes v1 -> v2 (after review of Arnout Vandecappelle):
>   - Update patch instead of using HOST_NOCCACHE)
> 
>   package/netsurf/0002-do-not-cross-compile-nsgenbind.patch | 4 +++-
>   1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/package/netsurf/0002-do-not-cross-compile-nsgenbind.patch b/package/netsurf/0002-do-not-cross-compile-nsgenbind.patch
> index 2d4637511e..7caad47a20 100644
> --- a/package/netsurf/0002-do-not-cross-compile-nsgenbind.patch
> +++ b/package/netsurf/0002-do-not-cross-compile-nsgenbind.patch
> @@ -8,6 +8,8 @@ the build, so it should not be built with the cross-compiler, but with
>   the native compiler.
>   
>   Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
> +[Fabrice: add quotes around BUILD_CC to fix build with ccache]
> +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
>   ---
>    Makefile | 2 +-
>    1 file changed, 1 insertion(+), 1 deletion(-)
> @@ -21,7 +23,7 @@ index f279f01..5698c87 100644
>    # prefixed install macro for each host sub target
>    define do_build_prefix_install
>   -	$(MAKE) install --directory=$1 HOST=$(BUILD) PREFIX=$(TMP_PREFIX) Q=$(Q) DESTDIR=
> -+	$(MAKE) install --directory=$1 HOST=$(BUILD) CC=$(BUILD_CC) PREFIX=$(TMP_PREFIX) Q=$(Q) DESTDIR=
> ++	$(MAKE) install --directory=$1 HOST=$(BUILD) CC="$(BUILD_CC)" PREFIX=$(TMP_PREFIX) Q=$(Q) DESTDIR=
>    
>    endef
>    
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v2, 2/2] package/netsurf: fix build with ccache

[Peter Korsgaard]

>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

 > Update second patch to fix the following build failure with ccache:
 > /home/autobuild/autobuild/instance-11/output-1/build/netsurf-3.10/tmpusr/share/netsurf-buildsystem/makefiles/Makefile.tools:413:
 > *** Unable to detect toolchain.  Stop.

 > Fixes:
 >  - http://autobuild.buildroot.org/results/b4ba19d7dcff1b0ee2b1546598b5ae6e9257a16d

 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
 > ---
 > Changes v1 -> v2 (after review of Arnout Vandecappelle):
 >  - Update patch instead of using HOST_NOCCACHE)

Committed to 2022.02.x, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot