From patchwork Mon Dec 7 20:39:22 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andr=C3=A9_Zwing?= X-Patchwork-Id: 553530 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id F0DAF1402D5 for ; Tue, 8 Dec 2015 07:39:42 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=dawncrow.de header.i=@dawncrow.de header.b=qFEfiona; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 2C52132E27; Mon, 7 Dec 2015 20:39:42 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id P5a66k2e7-2q; Mon, 7 Dec 2015 20:39:39 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 78A8B32E2B; Mon, 7 Dec 2015 20:39:39 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 36FFA1BFC02 for ; Mon, 7 Dec 2015 20:39:38 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 31BA532E21 for ; Mon, 7 Dec 2015 20:39:38 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 0TuIxEjkoYaI for ; Mon, 7 Dec 2015 20:39:36 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mo4-p00-ob.smtp.rzone.de (mo4-p00-ob.smtp.rzone.de [81.169.146.218]) by silver.osuosl.org (Postfix) with ESMTPS id DDB7532E27 for ; Mon, 7 Dec 2015 20:39:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1449520773; l=1985; s=domk; d=dawncrow.de; h=Content-Transfer-Encoding:Content-Type:MIME-Version:Date:To:Subject: From; bh=CIY2vEp2XzBybcziWZqyyiD3gmiaIf6PAdmJriNs61Q=; b=qFEfionav+6NiwKkuRYRmizYVSR+wsMooILwlgkuB0iSQbuYJZTdbMcxkpe0vfkbQdO fyhdfiZBSExRs/HdtzLHIjB9quVVz9Mxu33GFKzVph4TZF55elYCcy/yzMcvVF28HP/yR 9ryAqjmZ42Ec2074mrJa0ZzY3+P6ePUArzU= X-RZG-AUTH: :ImkWY2CseuihIZy6ZWWciR6unPh5JPSWE7VxbdUCFBN5njG7Q28CH4dMeHLjXw== X-RZG-CLASS-ID: mo00 Received: from [192.168.178.40] ([185.61.122.196]) by smtp.strato.de (RZmta 37.14 AUTH) with ESMTPSA id J040efrB7KdXlW4 (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA (curve secp521r1 with 521 ECDH bits, eq. 15360 bits RSA)) (Client did not present a certificate) for ; Mon, 7 Dec 2015 21:39:33 +0100 (CET) From: =?UTF-8?Q?Andr=c3=a9_Hentschel?= To: buildroot@buildroot.org X-Enigmail-Draft-Status: N1110 Message-ID: <5665EE7A.1080409@dawncrow.de> Date: Mon, 7 Dec 2015 21:39:22 +0100 User-Agent: Mozilla/5.0 (X11; Linux i686; rv:38.0) Gecko/20100101 Thunderbird/38.4.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/2] wine: Make the sane-config patch obsolete by using configure flags X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: André Hentschel --- package/wine/0003-sane-config-fix.patch | 21 --------------------- package/wine/wine.mk | 3 ++- 2 files changed, 2 insertions(+), 22 deletions(-) delete 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 deleted file mode 100644 index d53843a..0000000 --- a/package/wine/0003-sane-config-fix.patch +++ /dev/null @@ -1,21 +0,0 @@ -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 - -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 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