aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Peter Korsgaard <peter@korsgaard.com>2019-02-05 09:30:37 +0100
committerGravatar Peter Korsgaard <peter@korsgaard.com>2019-02-05 13:17:44 +0100
commit6da049f8ae61b956d135526722ce58fc2f67626a (patch)
tree66d0321cdb3508f3e9b324cede87118862f3e463
parent5692e6afa1cad6ec012742e5cd3a222c318e50b5 (diff)
downloadbuildroot-6da049f8ae61b956d135526722ce58fc2f67626a.tar.gz
buildroot-6da049f8ae61b956d135526722ce58fc2f67626a.tar.bz2
package/netsurf: fix build
Fixes: http://autobuild.buildroot.net/results/a5b/a5bd8969c398fc3101ffaec4aa715a827aec5770/ http://autobuild.buildroot.net/results/441/44112e8ad03f47125bbf4b231d800ebd5beef24b/ After commit 122089ad (package/netsurf: use TMP_PREFIX inside the build directory), the build fails with: COMPILE: src/stylesheet.c In file included from src/stylesheet.c:12:0: src/stylesheet.h:14:39: fatal error: libwapcaplet/libwapcaplet.h: No such file or directory #include <libwapcaplet/libwapcaplet.h> The reason is that netsurf installs its internal libraries to TMP_PREFIX during the build, and uses pkg-config to add the correct include/linker flags when building/linking the rest. Unfortunately this fails badly, as we prefix STAGING_DIR to the paths returned by pkg-config, causing gcc to fail to find the header / library files. This worked (by accident) when we pointed TMP_PREFIX to STAGING_DIR/usr, as STAGING_DIR/usr/include and STAGING_DIR/usr/lib are in the standard include/library search paths. Fix it by adding TMP_PREFIX/include and TMP_PREFIX/lib to the include/library search paths. We cannot easily add them to CFLAGS/LDFLAGS as the makefiles do not use override when appending to them, so instead pass both in CC (which is also used for linking). Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/netsurf/netsurf.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/package/netsurf/netsurf.mk b/package/netsurf/netsurf.mk
index d1efd66f34..e617707ade 100644
--- a/package/netsurf/netsurf.mk
+++ b/package/netsurf/netsurf.mk
@@ -76,7 +76,7 @@ NETSURF_MAKE_OPTS = \
FLEX="$(HOST_DIR)/bin/flex" \
PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
BUILD_CC="$(HOSTCC)" \
- CC="$(TARGET_CC)" \
+ CC="$(TARGET_CC) -I$(@D)/tmpusr/include -L$(@D)/tmpusr/lib" \
AR="$(TARGET_AR)" \
TMP_PREFIX=$(@D)/tmpusr \
NETSURF_CONFIG="$(NETSURF_CONFIG)" \