NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16ea3ee784
kumquat-buildroot/package/netsurf/netsurf.mk

115 lines
3.2 KiB
Makefile
Raw Normal View History

package/netsurf: new package Signed-off-by: Francois Perrad <francois.perrad@gadz.org> [Thomas: - rename BR2_PACKAGE_NETSURF_FRAMEBUFFER to BR2_PACKAGE_NETSURF_SDL, and use "sdl" everywhere instead of "framebuffer", since really SDL can display on something else than the framebuffer - use a "depends on BR2_PACKAGE_LIBGTK2" instead of a "depends on BR2_PACKAGE_XORG7 + many other depends on + select BR2_PACKAGE_LIBGTK2" - use PKG_CONFIG_HOST_BINARY for the pkg-config path] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2018-12-05 14:40:40 +01:00
################################################################################
#
# netsurf
#
################################################################################
package/netsurf: bump to version 3.10 Signed-off-by: Francois Perrad <francois.perrad@gadz.org> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2020-06-06 15:58:49 +02:00
NETSURF_VERSION = 3.10
package/netsurf: new package Signed-off-by: Francois Perrad <francois.perrad@gadz.org> [Thomas: - rename BR2_PACKAGE_NETSURF_FRAMEBUFFER to BR2_PACKAGE_NETSURF_SDL, and use "sdl" everywhere instead of "framebuffer", since really SDL can display on something else than the framebuffer - use a "depends on BR2_PACKAGE_LIBGTK2" instead of a "depends on BR2_PACKAGE_XORG7 + many other depends on + select BR2_PACKAGE_LIBGTK2" - use PKG_CONFIG_HOST_BINARY for the pkg-config path] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2018-12-05 14:40:40 +01:00
NETSURF_SOURCE = netsurf-all-$(NETSURF_VERSION).tar.gz
NETSURF_SITE = http://download.netsurf-browser.org/netsurf/releases/source-full
NETSURF_LICENSE = GPL-2.0
NETSURF_LICENSE_FILES = netsurf/COPYING
package/netsurf: needs host-vim Fixes: http://autobuild.buildroot.net/results/ade/adead660148cec04910b7a616cc85adfdd63ae95/ Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2019-07-28 11:23:54 +02:00
# host-vim needed for the xxd utility
package/netsurf: turn libcurl into an optional dependency Signed-off-by: Francois Perrad <francois.perrad@gadz.org> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2018-12-12 08:14:55 +01:00
NETSURF_DEPENDENCIES = expat jpeg libpng \
package/netsurf: needs host-vim Fixes: http://autobuild.buildroot.net/results/ade/adead660148cec04910b7a616cc85adfdd63ae95/ Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2019-07-28 11:23:54 +02:00
host-bison host-flex host-gperf host-pkgconf host-vim
package/netsurf: new package Signed-off-by: Francois Perrad <francois.perrad@gadz.org> [Thomas: - rename BR2_PACKAGE_NETSURF_FRAMEBUFFER to BR2_PACKAGE_NETSURF_SDL, and use "sdl" everywhere instead of "framebuffer", since really SDL can display on something else than the framebuffer - use a "depends on BR2_PACKAGE_LIBGTK2" instead of a "depends on BR2_PACKAGE_XORG7 + many other depends on + select BR2_PACKAGE_LIBGTK2" - use PKG_CONFIG_HOST_BINARY for the pkg-config path] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2018-12-05 14:40:40 +01:00
ifeq ($(BR2_PACKAGE_NETSURF_GTK),y)
NETSURF_DEPENDENCIES += libgtk2
package/netsurf: bump to version 3.10 Signed-off-by: Francois Perrad <francois.perrad@gadz.org> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2020-06-06 15:58:49 +02:00
NETSURF_FRONTEND = gtk2
package/netsurf: add GTK+ 3 frontend Signed-off-by: Francois Perrad <francois.perrad@gadz.org> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2018-12-12 08:14:54 +01:00
endif
ifeq ($(BR2_PACKAGE_NETSURF_GTK3),y)
NETSURF_DEPENDENCIES += libgtk3
NETSURF_FRONTEND = gtk3
endif
ifeq ($(BR2_PACKAGE_NETSURF_GTK)$(BR2_PACKAGE_NETSURF_GTK3),y)
package/netsurf: new package Signed-off-by: Francois Perrad <francois.perrad@gadz.org> [Thomas: - rename BR2_PACKAGE_NETSURF_FRAMEBUFFER to BR2_PACKAGE_NETSURF_SDL, and use "sdl" everywhere instead of "framebuffer", since really SDL can display on something else than the framebuffer - use a "depends on BR2_PACKAGE_LIBGTK2" instead of a "depends on BR2_PACKAGE_XORG7 + many other depends on + select BR2_PACKAGE_LIBGTK2" - use PKG_CONFIG_HOST_BINARY for the pkg-config path] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2018-12-05 14:40:40 +01:00
ifeq ($(BR2_PACKAGE_LIBRSVG),y)
NETSURF_DEPENDENCIES += librsvg
define NETSURF_SVG_CONFIGURE_CMDS
echo "override NETSURF_USE_RSVG := YES" >> $(@D)/netsurf/Makefile.config
echo "override NETSURF_USE_NSSVG := NO" >> $(@D)/netsurf/Makefile.config
endef
endif
endif
ifeq ($(BR2_PACKAGE_NETSURF_SDL),y)
package/netsurf: add dependency on host-libpng for sdl libpng is used by the convert_image host tool, which is built when SDL is enabled. Fixes: http://autobuild.buildroot.net/results/d0b/d0bbd563fe5c9463316b2ba0d7ef5553be0563bc/ Signed-off-by: Francois Perrad <francois.perrad@gadz.org> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
2018-12-11 16:02:09 +01:00
NETSURF_DEPENDENCIES += sdl host-libpng
package/netsurf: new package Signed-off-by: Francois Perrad <francois.perrad@gadz.org> [Thomas: - rename BR2_PACKAGE_NETSURF_FRAMEBUFFER to BR2_PACKAGE_NETSURF_SDL, and use "sdl" everywhere instead of "framebuffer", since really SDL can display on something else than the framebuffer - use a "depends on BR2_PACKAGE_LIBGTK2" instead of a "depends on BR2_PACKAGE_XORG7 + many other depends on + select BR2_PACKAGE_LIBGTK2" - use PKG_CONFIG_HOST_BINARY for the pkg-config path] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2018-12-05 14:40:40 +01:00
NETSURF_FRONTEND = framebuffer
package/netsurf: make sure host libpng can be found Commit 42c8f9f6b46e196a7c337c683a7df5ae6bd421b2 ("package/netsurf: add dependency on host-libpng for sdl") ensured host-libpng was built prior to netsurf when the SDL backend is selected. However, this is not sufficient for the netsurf build system to find libpng on the host, we need to help by providing the right HOST_CFLAGS and HOST_LDFLAGS. Fixes: http://autobuild.buildroot.net/results/d0bbd563fe5c9463316b2ba0d7ef5553be0563bc/ Signed-off-by: Francois Perrad <francois.perrad@gadz.org> [Thomas: rewrite commit message.] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2018-12-13 19:54:33 +01:00
NETSURF_CONFIG = \
package/netsurf: fix build of host tool convert_image Upstream commit http://source.netsurf-browser.org/netsurf.git/commit/frontends/framebuffer/Makefile?id=40cdf498b9153685b4cefe576e59f6b41090912b renamed the variable HOST_*FLAGS to BUILD_*FLAGS. This breaks the build of the host tool convert_image when png.h is not provided by the host system itself. Fixes: http://autobuild.buildroot.net/results/6ac/6ac71c7a41dd92a5fb924af9da7cedc40e745cfa/ Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2019-07-22 07:17:15 +02:00
BUILD_CFLAGS='$(HOST_CFLAGS)' \
BUILD_LDFLAGS='$(HOST_LDFLAGS) -lpng'
package/netsurf: add optional dependency on freetype Signed-off-by: Francois Perrad <francois.perrad@gadz.org> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2018-12-12 08:14:52 +01:00
ifeq ($(BR2_PACKAGE_FREETYPE),y)
NETSURF_DEPENDENCIES += freetype
define NETSURF_FONTLIB_CONFIGURE_CMDS
echo "override NETSURF_FB_FONTLIB := freetype" >> $(@D)/netsurf/Makefile.config
endef
endif
package/netsurf: new package Signed-off-by: Francois Perrad <francois.perrad@gadz.org> [Thomas: - rename BR2_PACKAGE_NETSURF_FRAMEBUFFER to BR2_PACKAGE_NETSURF_SDL, and use "sdl" everywhere instead of "framebuffer", since really SDL can display on something else than the framebuffer - use a "depends on BR2_PACKAGE_LIBGTK2" instead of a "depends on BR2_PACKAGE_XORG7 + many other depends on + select BR2_PACKAGE_LIBGTK2" - use PKG_CONFIG_HOST_BINARY for the pkg-config path] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2018-12-05 14:40:40 +01:00
endif
ifeq ($(BR2_PACKAGE_LIBICONV),y)
NETSURF_DEPENDENCIES += libiconv
define NETSURF_ICONV_CONFIGURE_CMDS
echo "CFLAGS += -DWITH_ICONV_FILTER" >> $(@D)/libparserutils/Makefile.config.override
echo "override NETSURF_USE_LIBICONV_PLUG := NO" >> $(@D)/netsurf/Makefile.config
endef
endif
package/netsurf: turn libcurl into an optional dependency Signed-off-by: Francois Perrad <francois.perrad@gadz.org> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2018-12-12 08:14:55 +01:00
ifeq ($(BR2_PACKAGE_LIBCURL),y)
NETSURF_DEPENDENCIES += libcurl openssl
else
define NETSURF_CURL_CONFIGURE_CMDS
echo "override NETSURF_USE_CURL := NO" >> $(@D)/netsurf/Makefile.config
echo "override NETSURF_USE_OPENSSL := NO" >> $(@D)/netsurf/Makefile.config
endef
endif
package/netsurf: add optional dependency on webp new feature of version 3.9 Signed-off-by: Francois Perrad <francois.perrad@gadz.org> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2019-07-21 16:11:08 +02:00
ifeq ($(BR2_PACKAGE_WEBP),y)
NETSURF_DEPENDENCIES += webp
define NETSURF_WEBP_CONFIGURE_CMDS
echo "override NETSURF_USE_WEBP := YES" >> $(@D)/netsurf/Makefile.config
endef
else
define NETSURF_WEBP_CONFIGURE_CMDS
echo "override NETSURF_USE_WEBP := NO" >> $(@D)/netsurf/Makefile.config
endef
endif
package/netsurf: new package Signed-off-by: Francois Perrad <francois.perrad@gadz.org> [Thomas: - rename BR2_PACKAGE_NETSURF_FRAMEBUFFER to BR2_PACKAGE_NETSURF_SDL, and use "sdl" everywhere instead of "framebuffer", since really SDL can display on something else than the framebuffer - use a "depends on BR2_PACKAGE_LIBGTK2" instead of a "depends on BR2_PACKAGE_XORG7 + many other depends on + select BR2_PACKAGE_LIBGTK2" - use PKG_CONFIG_HOST_BINARY for the pkg-config path] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2018-12-05 14:40:40 +01:00
define NETSURF_CONFIGURE_CMDS
$(NETSURF_ICONV_CONFIGURE_CMDS)
$(NETSURF_SVG_CONFIGURE_CMDS)
package/netsurf: add optional dependency on freetype Signed-off-by: Francois Perrad <francois.perrad@gadz.org> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2018-12-12 08:14:52 +01:00
$(NETSURF_FONTLIB_CONFIGURE_CMDS)
package/netsurf: turn libcurl into an optional dependency Signed-off-by: Francois Perrad <francois.perrad@gadz.org> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2018-12-12 08:14:55 +01:00
$(NETSURF_CURL_CONFIGURE_CMDS)
package/netsurf: add optional dependency on webp new feature of version 3.9 Signed-off-by: Francois Perrad <francois.perrad@gadz.org> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2019-07-21 16:11:08 +02:00
$(NETSURF_WEBP_CONFIGURE_CMDS)
package/netsurf: new package Signed-off-by: Francois Perrad <francois.perrad@gadz.org> [Thomas: - rename BR2_PACKAGE_NETSURF_FRAMEBUFFER to BR2_PACKAGE_NETSURF_SDL, and use "sdl" everywhere instead of "framebuffer", since really SDL can display on something else than the framebuffer - use a "depends on BR2_PACKAGE_LIBGTK2" instead of a "depends on BR2_PACKAGE_XORG7 + many other depends on + select BR2_PACKAGE_LIBGTK2" - use PKG_CONFIG_HOST_BINARY for the pkg-config path] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2018-12-05 14:40:40 +01:00
endef
package/netsurf: change how CFLAGS/LDFLAGS are passed Fixes: http://autobuild.buildroot.net/results/eeb2863c6237aac8428e49a5ee514d43088b0fb8 http://autobuild.buildroot.net/results/f938fd1515f1d6e11b57aa6e314135789da52a44 In commit 6da049f8ae61b956d135526722ce58fc2f67626a ("package/netsurf: fix build"), the CC variable passed to netsurf's build system was extended to pass some special -I and -L options needed for netsurf to find its own headers/libraries. Unfortunately, on some systems (including mine), it breaks the build, due to: toolpath_ := $(shell /bin/which $(CC__)) when $(CC__) contains some -I/-L options, they are considered to be options "to which", which causes the funny: /usr/bin/make install --directory=libnslog HOST=arm-buildroot-linux-uclibcgnueabi PREFIX=/home/thomas/projets/outputs/shared-netsurf/build/netsurf-3.8/tmpusr Q=@ WARNFLAGS='-Wall -W -Wno-error' DESTDIR= make[3]: warning: jobserver unavailable: using -j1. Add '+' to parent make rule. /bin/which: invalid option -- 'I' /bin/which: invalid option -- '/' /bin/which: invalid option -- 'h' /bin/which: invalid option -- 'o' /bin/which: invalid option -- 'm' /bin/which: invalid option -- 'e' /bin/which: invalid option -- '/' /bin/which: invalid option -- 't' /bin/which: invalid option -- 'h' /bin/which: invalid option -- 'o' /bin/which: invalid option -- 'm' /bin/which: invalid option -- 's' /bin/which: invalid option -- '/' [...] /bin/which: invalid option -- 'l' /bin/which: invalid option -- 'b' /bin/which: --read-alias, -i: Warning: stdin is a tty. and the build simply hangs. We cannot pass CFLAGS/LDFLAGS as make options, as they would override the CFLAGS definitions in netsurf Makefiles. However, those Makefiles use the construct: CFLAGS := $(CFLAGS) -more-flags so by passing CFLAGS and LDFLAGS through the make environment, which can achieve our goal. It is worth mentioning that it remains very fragile, because CFLAGS/LDFLAGS are used both for building target objects but also some host tools. The netsurf build system is really not good. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2019-05-09 22:28:07 +02:00
NETSURF_MAKE_ENV = \
$(TARGET_MAKE_ENV) \
CFLAGS="$(TARGET_CFLAGS) -I$(@D)/tmpusr/include" \
LDFLAGS="$(TARGET_LDFLAGS) -L$(@D)/tmpusr/lib"
package/netsurf: new package Signed-off-by: Francois Perrad <francois.perrad@gadz.org> [Thomas: - rename BR2_PACKAGE_NETSURF_FRAMEBUFFER to BR2_PACKAGE_NETSURF_SDL, and use "sdl" everywhere instead of "framebuffer", since really SDL can display on something else than the framebuffer - use a "depends on BR2_PACKAGE_LIBGTK2" instead of a "depends on BR2_PACKAGE_XORG7 + many other depends on + select BR2_PACKAGE_LIBGTK2" - use PKG_CONFIG_HOST_BINARY for the pkg-config path] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2018-12-05 14:40:40 +01:00
NETSURF_MAKE_OPTS = \
TARGET=$(NETSURF_FRONTEND) \
BISON="$(HOST_DIR)/bin/bison" \
FLEX="$(HOST_DIR)/bin/flex" \
PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
BUILD_CC="$(HOSTCC)" \
package/netsurf: change how CFLAGS/LDFLAGS are passed Fixes: http://autobuild.buildroot.net/results/eeb2863c6237aac8428e49a5ee514d43088b0fb8 http://autobuild.buildroot.net/results/f938fd1515f1d6e11b57aa6e314135789da52a44 In commit 6da049f8ae61b956d135526722ce58fc2f67626a ("package/netsurf: fix build"), the CC variable passed to netsurf's build system was extended to pass some special -I and -L options needed for netsurf to find its own headers/libraries. Unfortunately, on some systems (including mine), it breaks the build, due to: toolpath_ := $(shell /bin/which $(CC__)) when $(CC__) contains some -I/-L options, they are considered to be options "to which", which causes the funny: /usr/bin/make install --directory=libnslog HOST=arm-buildroot-linux-uclibcgnueabi PREFIX=/home/thomas/projets/outputs/shared-netsurf/build/netsurf-3.8/tmpusr Q=@ WARNFLAGS='-Wall -W -Wno-error' DESTDIR= make[3]: warning: jobserver unavailable: using -j1. Add '+' to parent make rule. /bin/which: invalid option -- 'I' /bin/which: invalid option -- '/' /bin/which: invalid option -- 'h' /bin/which: invalid option -- 'o' /bin/which: invalid option -- 'm' /bin/which: invalid option -- 'e' /bin/which: invalid option -- '/' /bin/which: invalid option -- 't' /bin/which: invalid option -- 'h' /bin/which: invalid option -- 'o' /bin/which: invalid option -- 'm' /bin/which: invalid option -- 's' /bin/which: invalid option -- '/' [...] /bin/which: invalid option -- 'l' /bin/which: invalid option -- 'b' /bin/which: --read-alias, -i: Warning: stdin is a tty. and the build simply hangs. We cannot pass CFLAGS/LDFLAGS as make options, as they would override the CFLAGS definitions in netsurf Makefiles. However, those Makefiles use the construct: CFLAGS := $(CFLAGS) -more-flags so by passing CFLAGS and LDFLAGS through the make environment, which can achieve our goal. It is worth mentioning that it remains very fragile, because CFLAGS/LDFLAGS are used both for building target objects but also some host tools. The netsurf build system is really not good. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2019-05-09 22:28:07 +02:00
CC="$(TARGET_CC)" \
package/netsurf: new package Signed-off-by: Francois Perrad <francois.perrad@gadz.org> [Thomas: - rename BR2_PACKAGE_NETSURF_FRAMEBUFFER to BR2_PACKAGE_NETSURF_SDL, and use "sdl" everywhere instead of "framebuffer", since really SDL can display on something else than the framebuffer - use a "depends on BR2_PACKAGE_LIBGTK2" instead of a "depends on BR2_PACKAGE_XORG7 + many other depends on + select BR2_PACKAGE_LIBGTK2" - use PKG_CONFIG_HOST_BINARY for the pkg-config path] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2018-12-05 14:40:40 +01:00
AR="$(TARGET_AR)" \
package/netsurf: use TMP_PREFIX inside the build directory The netsurf build system creates a stamp file inside TMP_PREFIX to know if the build was done, and if the stamp file exists, it doesn't do any build. Therefore, having this stamp file in STAGING_DIR prevents from rebuilding netsurf, even after removing its entire build directory: the stamp file exists in STAGING_DIR, and netsurf doesn't build anything, causing the installation to fail. We fix this by putting this temporary directory inside the netsurf build directory. We must mkdir this directory manually, otherwise the build fails with: COMPILE: src/stylesheet.c In file included from src/stylesheet.c:12:0: src/stylesheet.h:14:10: fatal error: libwapcaplet/libwapcaplet.h: No such file or directory ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ compilation terminated. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> [Arnout: mkdir it first] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
2018-12-17 09:47:10 +01:00
TMP_PREFIX=$(@D)/tmpusr \
package/netsurf: make sure host libpng can be found Commit 42c8f9f6b46e196a7c337c683a7df5ae6bd421b2 ("package/netsurf: add dependency on host-libpng for sdl") ensured host-libpng was built prior to netsurf when the SDL backend is selected. However, this is not sufficient for the netsurf build system to find libpng on the host, we need to help by providing the right HOST_CFLAGS and HOST_LDFLAGS. Fixes: http://autobuild.buildroot.net/results/d0bbd563fe5c9463316b2ba0d7ef5553be0563bc/ Signed-off-by: Francois Perrad <francois.perrad@gadz.org> [Thomas: rewrite commit message.] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2018-12-13 19:54:33 +01:00
NETSURF_CONFIG="$(NETSURF_CONFIG)" \
package/netsurf: new package Signed-off-by: Francois Perrad <francois.perrad@gadz.org> [Thomas: - rename BR2_PACKAGE_NETSURF_FRAMEBUFFER to BR2_PACKAGE_NETSURF_SDL, and use "sdl" everywhere instead of "framebuffer", since really SDL can display on something else than the framebuffer - use a "depends on BR2_PACKAGE_LIBGTK2" instead of a "depends on BR2_PACKAGE_XORG7 + many other depends on + select BR2_PACKAGE_LIBGTK2" - use PKG_CONFIG_HOST_BINARY for the pkg-config path] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2018-12-05 14:40:40 +01:00
PREFIX=/usr
define NETSURF_BUILD_CMDS
package/netsurf: use TMP_PREFIX inside the build directory The netsurf build system creates a stamp file inside TMP_PREFIX to know if the build was done, and if the stamp file exists, it doesn't do any build. Therefore, having this stamp file in STAGING_DIR prevents from rebuilding netsurf, even after removing its entire build directory: the stamp file exists in STAGING_DIR, and netsurf doesn't build anything, causing the installation to fail. We fix this by putting this temporary directory inside the netsurf build directory. We must mkdir this directory manually, otherwise the build fails with: COMPILE: src/stylesheet.c In file included from src/stylesheet.c:12:0: src/stylesheet.h:14:10: fatal error: libwapcaplet/libwapcaplet.h: No such file or directory ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ compilation terminated. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> [Arnout: mkdir it first] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
2018-12-17 09:47:10 +01:00
mkdir -p $(@D)/tmpusr
package/netsurf: change how CFLAGS/LDFLAGS are passed Fixes: http://autobuild.buildroot.net/results/eeb2863c6237aac8428e49a5ee514d43088b0fb8 http://autobuild.buildroot.net/results/f938fd1515f1d6e11b57aa6e314135789da52a44 In commit 6da049f8ae61b956d135526722ce58fc2f67626a ("package/netsurf: fix build"), the CC variable passed to netsurf's build system was extended to pass some special -I and -L options needed for netsurf to find its own headers/libraries. Unfortunately, on some systems (including mine), it breaks the build, due to: toolpath_ := $(shell /bin/which $(CC__)) when $(CC__) contains some -I/-L options, they are considered to be options "to which", which causes the funny: /usr/bin/make install --directory=libnslog HOST=arm-buildroot-linux-uclibcgnueabi PREFIX=/home/thomas/projets/outputs/shared-netsurf/build/netsurf-3.8/tmpusr Q=@ WARNFLAGS='-Wall -W -Wno-error' DESTDIR= make[3]: warning: jobserver unavailable: using -j1. Add '+' to parent make rule. /bin/which: invalid option -- 'I' /bin/which: invalid option -- '/' /bin/which: invalid option -- 'h' /bin/which: invalid option -- 'o' /bin/which: invalid option -- 'm' /bin/which: invalid option -- 'e' /bin/which: invalid option -- '/' /bin/which: invalid option -- 't' /bin/which: invalid option -- 'h' /bin/which: invalid option -- 'o' /bin/which: invalid option -- 'm' /bin/which: invalid option -- 's' /bin/which: invalid option -- '/' [...] /bin/which: invalid option -- 'l' /bin/which: invalid option -- 'b' /bin/which: --read-alias, -i: Warning: stdin is a tty. and the build simply hangs. We cannot pass CFLAGS/LDFLAGS as make options, as they would override the CFLAGS definitions in netsurf Makefiles. However, those Makefiles use the construct: CFLAGS := $(CFLAGS) -more-flags so by passing CFLAGS and LDFLAGS through the make environment, which can achieve our goal. It is worth mentioning that it remains very fragile, because CFLAGS/LDFLAGS are used both for building target objects but also some host tools. The netsurf build system is really not good. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2019-05-09 22:28:07 +02:00
$(NETSURF_MAKE_ENV) $(MAKE) -C $(@D) $(NETSURF_MAKE_OPTS) \
package/netsurf: new package Signed-off-by: Francois Perrad <francois.perrad@gadz.org> [Thomas: - rename BR2_PACKAGE_NETSURF_FRAMEBUFFER to BR2_PACKAGE_NETSURF_SDL, and use "sdl" everywhere instead of "framebuffer", since really SDL can display on something else than the framebuffer - use a "depends on BR2_PACKAGE_LIBGTK2" instead of a "depends on BR2_PACKAGE_XORG7 + many other depends on + select BR2_PACKAGE_LIBGTK2" - use PKG_CONFIG_HOST_BINARY for the pkg-config path] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2018-12-05 14:40:40 +01:00
build
endef
define NETSURF_INSTALL_TARGET_CMDS
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(NETSURF_MAKE_OPTS) \
DESTDIR=$(TARGET_DIR) install
endef
$(eval $(generic-package))
Reference in New Issue Copy Permalink