Message ID | 5661C4CF.7030709@dawncrow.de |
---|---|
State | Superseded |
Headers | show |
On 04-12-15 17:52, André Hentschel wrote: > Hi Thomas, > > Moving this discussion to the correct thread... > I meanwhile submitted https://bugs.winehq.org/show_bug.cgi?id=39660 which didn't caught much attention yet. > But I looked at it myself and I think I found a way to avoid patching Wine. > Wines configure exposes special COMPONENT_CFLAGS and COMPONENT_LIBS variables which get prioritized over "guessed" tools. > What's your opinion on this (afaict it works): > > > diff --git a/package/wine/wine.mk b/package/wine/wine.mk > index 38576db..e29d616 100644 > --- a/package/wine/wine.mk > +++ b/package/wine/wine.mk > @@ -173,8 +173,9 @@ endif > > ifeq ($(BR2_PACKAGE_SANE_BACKENDS),y) > WINE_CONF_OPTS += --with-sane > +WINE_CONF_OPTS += SANE_CFLAGS="`$(STAGING_DIR)/usr/bin/sane-config --cflags 2>/dev/null`" > +WINE_CONF_OPTS += SANE_LIBS="`$(STAGING_DIR)/usr/bin/sane-config --ldflags 2>/dev/null`" > WINE_DEPENDENCIES += sane-backends > -WINE_CONF_ENV += SANE_CONFIG=$(STAGING_DIR)/usr/bin/sane-config > else > WINE_CONF_OPTS += --without-sane > endif Looks good to me. However, doesn't sane install a pkg-config file as well? I'd prefer to use that one then. Regards, Arnout [snip]
Am 05.12.2015 um 15:48 schrieb Arnout Vandecappelle: > On 04-12-15 17:52, André Hentschel wrote: >> Hi Thomas, >> >> Moving this discussion to the correct thread... >> I meanwhile submitted https://bugs.winehq.org/show_bug.cgi?id=39660 which didn't caught much attention yet. >> But I looked at it myself and I think I found a way to avoid patching Wine. >> Wines configure exposes special COMPONENT_CFLAGS and COMPONENT_LIBS variables which get prioritized over "guessed" tools. >> What's your opinion on this (afaict it works): >> >> >> diff --git a/package/wine/wine.mk b/package/wine/wine.mk >> index 38576db..e29d616 100644 >> --- a/package/wine/wine.mk >> +++ b/package/wine/wine.mk >> @@ -173,8 +173,9 @@ endif >> >> ifeq ($(BR2_PACKAGE_SANE_BACKENDS),y) >> WINE_CONF_OPTS += --with-sane >> +WINE_CONF_OPTS += SANE_CFLAGS="`$(STAGING_DIR)/usr/bin/sane-config --cflags 2>/dev/null`" >> +WINE_CONF_OPTS += SANE_LIBS="`$(STAGING_DIR)/usr/bin/sane-config --ldflags 2>/dev/null`" >> WINE_DEPENDENCIES += sane-backends >> -WINE_CONF_ENV += SANE_CONFIG=$(STAGING_DIR)/usr/bin/sane-config >> else >> WINE_CONF_OPTS += --without-sane >> endif > > Looks good to me. However, doesn't sane install a pkg-config file as well? I'd > prefer to use that one then. Thx for the hint, but this is closer to what Wine would do, seems somewhat saver to me and I would stick to this approach if it's not a total NoGo
diff --git a/package/wine/wine.mk b/package/wine/wine.mk index 38576db..e29d616 100644 --- a/package/wine/wine.mk +++ b/package/wine/wine.mk @@ -173,8 +173,9 @@ endif ifeq ($(BR2_PACKAGE_SANE_BACKENDS),y) WINE_CONF_OPTS += --with-sane +WINE_CONF_OPTS += SANE_CFLAGS="`$(STAGING_DIR)/usr/bin/sane-config --cflags 2>/dev/null`" +WINE_CONF_OPTS += SANE_LIBS="`$(STAGING_DIR)/usr/bin/sane-config --ldflags 2>/dev/null`" WINE_DEPENDENCIES += sane-backends -WINE_CONF_ENV += SANE_CONFIG=$(STAGING_DIR)/usr/bin/sane-config else WINE_CONF_OPTS += --without-sane endif