a906c4c4fe
Fixes: http://autobuild.buildroot.net/results/eeb2863c6237aac8428e49a5ee514d43088b0fb8 http://autobuild.buildroot.net/results/f938fd1515f1d6e11b57aa6e314135789da52a44 In commit6da049f8ae("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> (cherry picked from commit1da0a84f78) Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
102 lines
2.8 KiB
Makefile
102 lines
2.8 KiB
Makefile
################################################################################
|
|
#
|
|
# netsurf
|
|
#
|
|
################################################################################
|
|
|
|
NETSURF_VERSION = 3.8
|
|
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
|
|
NETSURF_DEPENDENCIES = expat jpeg libpng \
|
|
host-bison host-flex host-gperf host-pkgconf
|
|
|
|
ifeq ($(BR2_PACKAGE_NETSURF_GTK),y)
|
|
NETSURF_DEPENDENCIES += libgtk2
|
|
NETSURF_FRONTEND = gtk
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_NETSURF_GTK3),y)
|
|
NETSURF_DEPENDENCIES += libgtk3
|
|
NETSURF_FRONTEND = gtk3
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_NETSURF_GTK)$(BR2_PACKAGE_NETSURF_GTK3),y)
|
|
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)
|
|
NETSURF_DEPENDENCIES += sdl host-libpng
|
|
NETSURF_FRONTEND = framebuffer
|
|
NETSURF_CONFIG = \
|
|
HOST_CFLAGS='$(HOST_CFLAGS)' \
|
|
HOST_LDFLAGS='$(HOST_LDFLAGS) -lpng'
|
|
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
|
|
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
|
|
|
|
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
|
|
|
|
define NETSURF_CONFIGURE_CMDS
|
|
$(NETSURF_ICONV_CONFIGURE_CMDS)
|
|
$(NETSURF_SVG_CONFIGURE_CMDS)
|
|
$(NETSURF_FONTLIB_CONFIGURE_CMDS)
|
|
$(NETSURF_CURL_CONFIGURE_CMDS)
|
|
endef
|
|
|
|
NETSURF_MAKE_ENV = \
|
|
$(TARGET_MAKE_ENV) \
|
|
CFLAGS="$(TARGET_CFLAGS) -I$(@D)/tmpusr/include" \
|
|
LDFLAGS="$(TARGET_LDFLAGS) -L$(@D)/tmpusr/lib"
|
|
|
|
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)" \
|
|
CC="$(TARGET_CC)" \
|
|
AR="$(TARGET_AR)" \
|
|
TMP_PREFIX=$(@D)/tmpusr \
|
|
NETSURF_CONFIG="$(NETSURF_CONFIG)" \
|
|
PREFIX=/usr
|
|
|
|
define NETSURF_BUILD_CMDS
|
|
mkdir -p $(@D)/tmpusr
|
|
$(NETSURF_MAKE_ENV) $(MAKE) -C $(@D) $(NETSURF_MAKE_OPTS) \
|
|
build
|
|
endef
|
|
|
|
define NETSURF_INSTALL_TARGET_CMDS
|
|
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(NETSURF_MAKE_OPTS) \
|
|
DESTDIR=$(TARGET_DIR) install
|
|
endef
|
|
|
|
$(eval $(generic-package))
|