From ff89e1eb0cdb8ebe9cbd2cf944f43ed132afcb17 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 5 Jul 2015 13:15:00 +0200 Subject: wine: fix sane related build failure If sane is installed system-wide on the build machine, then the sane-config binary found is the one of the system, which returns incorrect library paths for cross-compilation. To fix this, this commit adds a patch to wine to make it support a SANE_CONFIG environment variable, and then adjusts wine.mk to explicitly pass the path to $(STAGING_DIR)/usr/bin/sane-config. Fixes: http://autobuild.buildroot.org/results/8bd/8bdc1eed55075313403aa8a6c9af6a427bce198e/ Signed-off-by: Thomas Petazzoni Acked-by: "Yann E. MORIN" --- package/wine/wine.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'package/wine/wine.mk') diff --git a/package/wine/wine.mk b/package/wine/wine.mk index 1ae038efb5..d6fb9c6d01 100644 --- a/package/wine/wine.mk +++ b/package/wine/wine.mk @@ -174,6 +174,7 @@ endif ifeq ($(BR2_PACKAGE_SANE_BACKENDS),y) WINE_CONF_OPTS += --with-sane WINE_DEPENDENCIES += sane-backends +WINE_CONF_ENV += SANE_CONFIG=$(STAGING_DIR)/usr/bin/sane-config else WINE_CONF_OPTS += --without-sane endif -- cgit v1.2.1