Forráskód Böngészése

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>
Francois Perrad 6 éve
szülő
commit
9b0ac87538
1 módosított fájl, 4 hozzáadás és 0 törlés
  1. 4 0
      package/netsurf/netsurf.mk

+ 4 - 0
package/netsurf/netsurf.mk

@@ -35,6 +35,9 @@ endif
 ifeq ($(BR2_PACKAGE_NETSURF_SDL),y)
 ifeq ($(BR2_PACKAGE_NETSURF_SDL),y)
 NETSURF_DEPENDENCIES += sdl host-libpng
 NETSURF_DEPENDENCIES += sdl host-libpng
 NETSURF_FRONTEND = framebuffer
 NETSURF_FRONTEND = framebuffer
+NETSURF_CONFIG = \
+	HOST_CFLAGS=-I$(HOST_DIR)/include \
+	HOST_LDFLAGS='-lpng -L$(HOST_DIR)/lib'
 ifeq ($(BR2_PACKAGE_FREETYPE),y)
 ifeq ($(BR2_PACKAGE_FREETYPE),y)
 NETSURF_DEPENDENCIES += freetype
 NETSURF_DEPENDENCIES += freetype
 define NETSURF_FONTLIB_CONFIGURE_CMDS
 define NETSURF_FONTLIB_CONFIGURE_CMDS
@@ -76,6 +79,7 @@ NETSURF_MAKE_OPTS = \
 	CC="$(TARGET_CC)" \
 	CC="$(TARGET_CC)" \
 	AR="$(TARGET_AR)" \
 	AR="$(TARGET_AR)" \
 	TMP_PREFIX=$(STAGING_DIR)/usr \
 	TMP_PREFIX=$(STAGING_DIR)/usr \
+	NETSURF_CONFIG="$(NETSURF_CONFIG)" \
 	PREFIX=/usr
 	PREFIX=/usr
 
 
 define NETSURF_BUILD_CMDS
 define NETSURF_BUILD_CMDS