| Message ID | 1436094900-3217-1-git-send-email-thomas.petazzoni@free-electrons.com |
|---|---|
| State | Accepted |
| Headers | show |
Thomas, All, On 2015-07-05 13:15 +0200, Thomas Petazzoni spake thusly: > 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> Regards, Yann E. MORIN. > --- > package/wine/0003-sane-config-fix.patch | 21 +++++++++++++++++++++ > package/wine/wine.mk | 1 + > 2 files changed, 22 insertions(+) > create mode 100644 package/wine/0003-sane-config-fix.patch > > diff --git a/package/wine/0003-sane-config-fix.patch b/package/wine/0003-sane-config-fix.patch > new file mode 100644 > index 0000000..d53843a > --- /dev/null > +++ b/package/wine/0003-sane-config-fix.patch > @@ -0,0 +1,21 @@ > +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=""]) > diff --git a/package/wine/wine.mk b/package/wine/wine.mk > index 1ae038e..d6fb9c6 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 > -- > 2.4.5 > > _______________________________________________ > buildroot mailing list > buildroot@busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot
Hello, On Sun, 5 Jul 2015 13:15:00 +0200, Thomas Petazzoni wrote: > 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> > --- > package/wine/0003-sane-config-fix.patch | 21 +++++++++++++++++++++ > package/wine/wine.mk | 1 + > 2 files changed, 22 insertions(+) > create mode 100644 package/wine/0003-sane-config-fix.patch Applied. Thomas
diff --git a/package/wine/0003-sane-config-fix.patch b/package/wine/0003-sane-config-fix.patch new file mode 100644 index 0000000..d53843a --- /dev/null +++ b/package/wine/0003-sane-config-fix.patch @@ -0,0 +1,21 @@ +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=""]) diff --git a/package/wine/wine.mk b/package/wine/wine.mk index 1ae038e..d6fb9c6 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
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> --- package/wine/0003-sane-config-fix.patch | 21 +++++++++++++++++++++ package/wine/wine.mk | 1 + 2 files changed, 22 insertions(+) create mode 100644 package/wine/0003-sane-config-fix.patch