Commit ff89e1eb authored by Thomas Petazzoni's avatar Thomas Petazzoni
Browse files

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: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
parent ae0d54ab

package/wine/0003-sane-config-fix.patch

0 → 100644
+21 −0
Original line number Diff line number Diff line 
Add support for SANE_CONFIG variable



Instead of using directly the sane-config command, allow to pass a

SANE_CONFIG environment variable to override where to find the

sane-config tool.



Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>



Index: b/configure.ac

===================================================================

--- a/configure.ac

+++ b/configure.ac

@@ -1375,7 +1375,7 @@

 if test "x$with_sane" != "xno"

 then

     ac_save_CPPFLAGS="$CPPFLAGS"

-    WINE_PACKAGE_FLAGS(SANE,[libsane],,[`sane-config --cflags 2>/dev/null`],[`sane-config --ldflags 2>/dev/null`])

+    WINE_PACKAGE_FLAGS(SANE,[libsane],,[`${SANE_CONFIG:-sane-config} --cflags 2>/dev/null`],[`${SANE_CONFIG:-sane-config} --ldflags 2>/dev/null`])

     AC_CHECK_HEADER(sane/sane.h,

         [WINE_CHECK_SONAME(sane,sane_init,,[SANE_CFLAGS=""],[$SANE_LIBS])],

         [SANE_CFLAGS=""])

package/wine/wine.mk

+1 −0
Original line number Diff line number Diff line
@@ -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