Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: "André Hentschel" <nerv@dawncrow.de>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 2/2] wine: Fix more likely *-config problems
Date: Mon, 7 Dec 2015 21:40:01 +0100	[thread overview]
Message-ID: <5665EEA1.9000504@dawncrow.de> (raw)

Signed-off-by: Andr? Hentschel <nerv@dawncrow.de>
---
 package/wine/wine.mk | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/package/wine/wine.mk b/package/wine/wine.mk
index e29d616..6dfd3f0 100644
--- a/package/wine/wine.mk
+++ b/package/wine/wine.mk
@@ -72,7 +72,11 @@ endif
 # To support freetype in wine we also need freetype in host-wine for the cross compiling tools
 ifeq ($(BR2_PACKAGE_FREETYPE),y)
 WINE_CONF_OPTS += --with-freetype
+WINE_CONF_OPTS += FREETYPE_CFLAGS="`($(STAGING_DIR)/usr/bin/freetype-config --cflags || $(STAGING_DIR)/usr/bin/freetype2-config --cflags) 2>/dev/null`"
+WINE_CONF_OPTS += FREETYPE_LIBS="`($(STAGING_DIR)/usr/bin/freetype-config --ldflags || $(STAGING_DIR)/usr/bin/freetype2-config --ldflags) 2>/dev/null`"
 HOST_WINE_CONF_OPTS += --with-freetype
+HOST_WINE_CONF_OPTS += FREETYPE_CFLAGS="`($(HOST_DIR)/usr/bin/freetype-config --cflags || $(HOST_DIR)/usr/bin/freetype2-config --cflags) 2>/dev/null`"
+HOST_WINE_CONF_OPTS += FREETYPE_LIBS="`($(HOST_DIR)/usr/bin/freetype-config --ldflags || $(HOST_DIR)/usr/bin/freetype2-config --ldflags) 2>/dev/null`"
 WINE_DEPENDENCIES += freetype
 HOST_WINE_DEPENDENCIES += host-freetype
 else
@@ -138,6 +142,8 @@ endif
 
 ifeq ($(BR2_PACKAGE_LIBXML2),y)
 WINE_CONF_OPTS += --with-xml
+WINE_CONF_OPTS += XML2_CFLAGS="`$(STAGING_DIR)/usr/bin/xml2-config --cflags 2>/dev/null`"
+WINE_CONF_OPTS += XML2_LIBS="`$(STAGING_DIR)/usr/bin/xml2-config --ldflags 2>/dev/null`"
 WINE_DEPENDENCIES += libxml2
 else
 WINE_CONF_OPTS += --without-xml
@@ -145,6 +151,8 @@ endif
 
 ifeq ($(BR2_PACKAGE_LIBXSLT),y)
 WINE_CONF_OPTS += --with-xslt
+WINE_CONF_OPTS += XSLT_CFLAGS="`$(STAGING_DIR)/usr/bin/xslt-config --cflags 2>/dev/null`"
+WINE_CONF_OPTS += XSLT_LIBS="`$(STAGING_DIR)/usr/bin/xslt-config --ldflags 2>/dev/null`"
 WINE_DEPENDENCIES += libxslt
 else
 WINE_CONF_OPTS += --without-xslt
-- 
1.9.1

                 reply	other threads:[~2015-12-07 20:40 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=5665EEA1.9000504@dawncrow.de \
    --to=nerv@dawncrow.de \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox