summaryrefslogtreecommitdiffstats
path: root/package/wine/wine.mk
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2015-07-05 13:15:00 +0200
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2015-07-05 17:16:40 +0200
commitff89e1eb0cdb8ebe9cbd2cf944f43ed132afcb17 (patch)
treebe0974818cca8278269876ba0879f7cc9d94ae96 /package/wine/wine.mk
parentae0d54ab77a1dcb4af3b5515d3e3a99203e100f2 (diff)
downloadbuildroot-ff89e1eb0cdb8ebe9cbd2cf944f43ed132afcb17.tar.gz
buildroot-ff89e1eb0cdb8ebe9cbd2cf944f43ed132afcb17.zip
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 <thomas.petazzoni@free-electrons.com> Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Diffstat (limited to 'package/wine/wine.mk')
-rw-r--r--package/wine/wine.mk1
1 files changed, 1 insertions, 0 deletions
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
OpenPOWER on IntegriCloud