From patchwork Mon Oct 22 12:06:55 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 193136 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id ADA0E2C008B for ; Mon, 22 Oct 2012 23:08:31 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 658C88BDA4; Mon, 22 Oct 2012 12:08:24 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id fTab39sX+1Pd; Mon, 22 Oct 2012 12:08:06 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id A688B8A2A4; Mon, 22 Oct 2012 12:07:52 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 7D63D8F74A for ; Mon, 22 Oct 2012 12:07:27 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id B0E7E101AA2 for ; Mon, 22 Oct 2012 12:07:19 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Omm4KcRTyj+G for ; Mon, 22 Oct 2012 12:07:17 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail.free-electrons.com (mail.free-electrons.com [88.190.12.23]) by fraxinus.osuosl.org (Postfix) with ESMTP id BC08D101920 for ; Mon, 22 Oct 2012 12:07:17 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 106) id 6EF7C192; Mon, 22 Oct 2012 14:06:37 +0200 (CEST) Received: from localhost (col31-4-88-188-83-94.fbx.proxad.net [88.188.83.94]) by mail.free-electrons.com (Postfix) with ESMTPSA id 6C5801AE for ; Mon, 22 Oct 2012 14:06:19 +0200 (CEST) From: Thomas Petazzoni To: buildroot@uclibc.org Date: Mon, 22 Oct 2012 14:06:55 +0200 Message-Id: <1350907617-14368-5-git-send-email-thomas.petazzoni@free-electrons.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1350907617-14368-1-git-send-email-thomas.petazzoni@free-electrons.com> References: <1350907617-14368-1-git-send-email-thomas.petazzoni@free-electrons.com> Subject: [Buildroot] [PATCH 5/7] xapp_xgc: fix build against Xmu by bumping version X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Fix a build issue similar to the one encountered on xapp_listres at http://autobuild.buildroot.org/results/06d0ef38165769df38047c1f64d4cfae835e9e54/. Note that this new version requires a minor cross-compilation fix in configure.ac, which has already been committed upstream but is not yet part of a release tarball. Signed-off-by: Thomas Petazzoni --- .../xapp_xgc/xapp_xgc-replace-ac-check-file.patch | 29 ++++++++++++++++++++ package/x11r7/xapp_xgc/xapp_xgc.mk | 3 +- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 package/x11r7/xapp_xgc/xapp_xgc-replace-ac-check-file.patch diff --git a/package/x11r7/xapp_xgc/xapp_xgc-replace-ac-check-file.patch b/package/x11r7/xapp_xgc/xapp_xgc-replace-ac-check-file.patch new file mode 100644 index 0000000..97cbcda --- /dev/null +++ b/package/x11r7/xapp_xgc/xapp_xgc-replace-ac-check-file.patch @@ -0,0 +1,29 @@ +From ff668395fc408f540604bd534e323b483f52a4ea Mon Sep 17 00:00:00 2001 +From: Gaetan Nadon +Date: Mon, 01 Nov 2010 17:19:23 +0000 +Subject: config: replace AC_CHECK_FILE with test -f + +* AC_CHECK_FILE doesn't work for cross compilation + +Signed-off-by: Gaetan Nadon +--- +diff --git a/configure.ac b/configure.ac +index 667a3e7..0644050 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -36,8 +36,11 @@ XORG_DEFAULT_OPTIONS + AC_PROG_LEX + AC_PROG_YACC + AC_PATH_PROG([YACC_INST], $YACC) +-AC_CHECK_FILE([$srcdir/gram.c], [], +- [test -z "$YACC_INST" && AC_MSG_ERROR([yacc not found - unable to compile gram.y])]) ++if test ! -f "gram.c"; then ++ if test -z "$YACC_INST"; then ++ AC_MSG_ERROR([yacc not found - unable to compile gram.y]) ++ fi ++fi + + PKG_CHECK_MODULES(XGC, xaw7 xt) + xt_appdefaultdir=`$PKG_CONFIG --variable=appdefaultdir xt` +-- +cgit v0.9.0.2-2-gbebe diff --git a/package/x11r7/xapp_xgc/xapp_xgc.mk b/package/x11r7/xapp_xgc/xapp_xgc.mk index 8d02a53..cfb3164 100644 --- a/package/x11r7/xapp_xgc/xapp_xgc.mk +++ b/package/x11r7/xapp_xgc/xapp_xgc.mk @@ -4,9 +4,10 @@ # ################################################################################ -XAPP_XGC_VERSION = 1.0.1 +XAPP_XGC_VERSION = 1.0.3 XAPP_XGC_SOURCE = xgc-$(XAPP_XGC_VERSION).tar.bz2 XAPP_XGC_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XGC_DEPENDENCIES = xlib_libXaw +XAPP_XGC_AUTORECONF = YES $(eval $(autotools-package))