From patchwork Thu Nov 15 22:28:47 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 199453 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id BF64E2C03AF for ; Fri, 16 Nov 2012 09:29:25 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id AC746A0423; Thu, 15 Nov 2012 22:29:22 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 9lu3oggadxmL; Thu, 15 Nov 2012 22:29:11 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id BCBEFA041F; Thu, 15 Nov 2012 22:29:05 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 96E0D8F753 for ; Thu, 15 Nov 2012 22:29:07 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 3105B310BF for ; Thu, 15 Nov 2012 22:29:03 +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 x0zfL0Q4ZSY4 for ; Thu, 15 Nov 2012 22:29:01 +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 silver.osuosl.org (Postfix) with ESMTP id BEBB43044D for ; Thu, 15 Nov 2012 22:29:00 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 106) id B34DC153; Thu, 15 Nov 2012 23:28:56 +0100 (CET) Received: from localhost (humanoidz.org [82.247.183.72]) by mail.free-electrons.com (Postfix) with ESMTPSA id 858A012B for ; Thu, 15 Nov 2012 23:28:47 +0100 (CET) From: Thomas Petazzoni To: buildroot@uclibc.org Date: Thu, 15 Nov 2012 23:28:47 +0100 Message-Id: <1353018527-25481-1-git-send-email-thomas.petazzoni@free-electrons.com> X-Mailer: git-send-email 1.7.9.5 Subject: [Buildroot] [PATCH] xlib_libXt: add patch to fix cross-compilation issue 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 Fixes the following build failure: http://autobuild.buildroot.org/results/2815885d589d75259508bcce4f272b8dddb3be77/build-end.log Signed-off-by: Thomas Petazzoni --- ...il-don-t-link-makestrs-with-target-cflags.patch | 51 ++++++++++++++++++++ package/x11r7/xlib_libXt/xlib_libXt.mk | 1 + 2 files changed, 52 insertions(+) create mode 100644 package/x11r7/xlib_libXt/xlib_libXt-0001-util-don-t-link-makestrs-with-target-cflags.patch diff --git a/package/x11r7/xlib_libXt/xlib_libXt-0001-util-don-t-link-makestrs-with-target-cflags.patch b/package/x11r7/xlib_libXt/xlib_libXt-0001-util-don-t-link-makestrs-with-target-cflags.patch new file mode 100644 index 0000000..aafb352 --- /dev/null +++ b/package/x11r7/xlib_libXt/xlib_libXt-0001-util-don-t-link-makestrs-with-target-cflags.patch @@ -0,0 +1,51 @@ +From 9324466141626518e5a67838813562ec6ef62ba3 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Thu, 15 Nov 2012 18:31:53 +0100 +Subject: [PATCH] util: don't link makestrs with target cflags + +The line: + +makestrs_CFLAGS = $(XT_CFLAGS) + +in util/Makefile.am is wrong because it adds target cflags to the +compilation of makestrs, which is built for the build machine, which +leads to build failures when cross-compiling. + +We also remove the inclusion of from makestrs.c, because +it was the only non-standard header being included (and therefore +possibly requiring special cflags), but it was in reality not useful +at all to build makestrs.c. + +Signed-off-by: Thomas Petazzoni +--- + util/Makefile.am | 1 - + util/makestrs.c | 1 - + 2 files changed, 2 deletions(-) + +diff --git a/util/Makefile.am b/util/Makefile.am +index 969ecef..cc6f3fc 100644 +--- a/util/Makefile.am ++++ b/util/Makefile.am +@@ -10,7 +10,6 @@ EXTRA_DIST = \ + StrDefs.ht \ + string.list + +-makestrs_CFLAGS = $(XT_CFLAGS) + makestrs_SOURCES = makestrs.c + + +diff --git a/util/makestrs.c b/util/makestrs.c +index 3551cc1..456735b 100644 +--- a/util/makestrs.c ++++ b/util/makestrs.c +@@ -27,7 +27,6 @@ in this Software without prior written authorization from The Open Group. + /* Constructs string definitions */ + + #include +-#include + #include + #include + #if defined(macII) && !defined(__STDC__) /* stdlib.h fails to define these */ +-- +1.7.9.5 + diff --git a/package/x11r7/xlib_libXt/xlib_libXt.mk b/package/x11r7/xlib_libXt/xlib_libXt.mk index b2667d3..fd8f079 100644 --- a/package/x11r7/xlib_libXt/xlib_libXt.mk +++ b/package/x11r7/xlib_libXt/xlib_libXt.mk @@ -10,5 +10,6 @@ XLIB_LIBXT_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXT_INSTALL_STAGING = YES XLIB_LIBXT_DEPENDENCIES = xlib_libSM xlib_libX11 xproto_kbproto xproto_xproto xcb-proto libxcb host-xproto_xproto XLIB_LIBXT_CONF_OPT = --disable-malloc0returnsnull --disable-install-makestrs +XLIB_LIBXT_AUTORECONF = YES $(eval $(autotools-package))