package/netsurf: fix build
PATCH 1/1 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).
--- package/netsurf/netsurf.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/netsurf/netsurf.mk +1 -1
@@ -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)" \
Signature · 1 line
2.11.0
PATCH 1/1 package/netsurf: fix build
Quoted 24 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Peter" == Peter Korsgaard <[email protected]> writes:
Fixes:
http://autobuild.buildroot.net/results/a5b/a5bd8969c398fc3101ffaec4aa715a827aec5770/
http://autobuild.buildroot.net/results/441/44112e8ad03f47125bbf4b231d800ebd5beef24b/After commit
122089ad(package/netsurf: useTMP_PREFIXinside the build directory), the build fails with:COMPILE:
src/stylesheet.c
In file included fromsrc/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_PREFIXduring the build, and uses pkg-config to add the correctinclude/linkerflags when building/linking the rest. Unfortunately this fails badly, as we prefixSTAGING_DIRto the paths returned by pkg-config, causing gcc to fail to find the header / library files.This worked (by accident) when we pointed
TMP_PREFIXto STAGING_DIR/usr, as STAGING_DIR/usr/include and STAGING_DIR/usr/lib are in the standardinclude/librarysearch paths.
Quoted 6 lines
Fix it by adding TMP_PREFIX/include and TMP_PREFIX/lib to the
include/librarysearch 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 <[email protected]>
It isn't very nice, but I don't think we have any better solution.
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard