From patchwork Fri Nov 16 17:23:50 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 199693 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 655892C0091 for ; Sat, 17 Nov 2012 04:24:25 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 2A923101EBC; Fri, 16 Nov 2012 17:24:18 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id N1f+RC-8XgQB; Fri, 16 Nov 2012 17:24:14 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 6EA5910B8C6; Fri, 16 Nov 2012 17:24:13 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 37E4A8F74A for ; Fri, 16 Nov 2012 17:24:19 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id AF5278161C for ; Fri, 16 Nov 2012 17:24:14 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id iVE86KGMoOgr for ; Fri, 16 Nov 2012 17:24:13 +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 whitealder.osuosl.org (Postfix) with ESMTP id 5727983E8B for ; Fri, 16 Nov 2012 17:24:13 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 106) id ACCF3268; Fri, 16 Nov 2012 18:24:08 +0100 (CET) Received: from localhost (unknown [78.250.236.96]) by mail.free-electrons.com (Postfix) with ESMTPSA id BF944DB for ; Fri, 16 Nov 2012 18:23:59 +0100 (CET) From: Thomas Petazzoni To: buildroot@busybox.net Date: Fri, 16 Nov 2012 18:23:50 +0100 Message-Id: X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: In-Reply-To: References: Subject: [Buildroot] [PATCH 01/12] xlib_libXt: bump version to 1.1.3 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 Needed by the bump of xapp_clipboard, itself needed to avoid the following build failure: http://autobuild.buildroot.org/results/1a4f84ad76ad8c4e70bff6878fc232edf46ff8f1/build-end.log Signed-off-by: Thomas Petazzoni --- ...il-don-t-link-makestrs-with-target-cflags.patch | 19 +++++++++---------- package/x11r7/xlib_libXt/xlib_libXt.mk | 2 +- 2 files changed, 10 insertions(+), 11 deletions(-) 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 index aafb352..692d03b 100644 --- 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 @@ -1,11 +1,11 @@ -From 9324466141626518e5a67838813562ec6ef62ba3 Mon Sep 17 00:00:00 2001 +From 3f064076c783914cafdff028db303681dae4291d 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 +Subject: [PATCH] libXt: util: don't link makestrs with target cflags The line: -makestrs_CFLAGS = $(XT_CFLAGS) +AM_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 @@ -23,19 +23,19 @@ Signed-off-by: Thomas Petazzoni 2 files changed, 2 deletions(-) diff --git a/util/Makefile.am b/util/Makefile.am -index 969ecef..cc6f3fc 100644 +index dedfa6b..cc6f3fc 100644 --- a/util/Makefile.am +++ b/util/Makefile.am @@ -10,7 +10,6 @@ EXTRA_DIST = \ - StrDefs.ht \ - string.list + StrDefs.ht \ + string.list --makestrs_CFLAGS = $(XT_CFLAGS) +-AM_CFLAGS = $(XT_CFLAGS) makestrs_SOURCES = makestrs.c diff --git a/util/makestrs.c b/util/makestrs.c -index 3551cc1..456735b 100644 +index a52866a..00c861f 100644 --- a/util/makestrs.c +++ b/util/makestrs.c @@ -27,7 +27,6 @@ in this Software without prior written authorization from The Open Group. @@ -45,7 +45,6 @@ index 3551cc1..456735b 100644 -#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 fd8f079..9f9aaea 100644 --- a/package/x11r7/xlib_libXt/xlib_libXt.mk +++ b/package/x11r7/xlib_libXt/xlib_libXt.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBXT_VERSION = 1.0.9 +XLIB_LIBXT_VERSION = 1.1.3 XLIB_LIBXT_SOURCE = libXt-$(XLIB_LIBXT_VERSION).tar.bz2 XLIB_LIBXT_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXT_INSTALL_STAGING = YES