From patchwork Mon Oct 28 09:47:27 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phil Eichinger X-Patchwork-Id: 286425 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 774182C00B3 for ; Mon, 28 Oct 2013 20:50:30 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 7CF798BA99; Mon, 28 Oct 2013 09:50:28 +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 S46klcnHkXZs; Mon, 28 Oct 2013 09:50:26 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 962EA8B431; Mon, 28 Oct 2013 09:50:26 +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 085E71BFA38 for ; Mon, 28 Oct 2013 09:50:26 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 0354A8B431 for ; Mon, 28 Oct 2013 09:50:26 +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 rmm11-Tnun-u for ; Mon, 28 Oct 2013 09:50:24 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-we0-f169.google.com (mail-we0-f169.google.com [74.125.82.169]) by whitealder.osuosl.org (Postfix) with ESMTPS id B2C5C8B35F for ; Mon, 28 Oct 2013 09:50:23 +0000 (UTC) Received: by mail-we0-f169.google.com with SMTP id q58so6358892wes.14 for ; Mon, 28 Oct 2013 02:50:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=t05+xUgxopWVCt92r984NB/B3G60ytDY3kx1S05LKLU=; b=ycUWCEWHCIPWR1GSSReW/HuCfZ1XbHHumWQ7UMskyiYmLn1Btkyb4mfM81EtHMqpkI zoIBW1+Y6siTwIiHWpqKSYjIdcvjqYDzS7wk83GP1z+BntCMa/z2r8nImNJq1GLQ2kd8 Jx574WMVlfyS+bPLUgG03BYGC+Tk8vPCJxKhtL0BGhDBdOAxlbSwj3qZ/IfLwNW2UeSD AWe5luulw1LYrTNEiiCKiLOyTAuVwcOkXhiSvUMpYX6Cx+TDw2i1dkK4g6tOlkE9lTLC jc3aKYNEi61gjDPx98aZ6ucw+7Dn8POVwJMT82KumDJCptCLqda2jcihtKUDweEKs2i1 68Aw== X-Received: by 10.180.73.40 with SMTP id i8mr8166520wiv.37.1382953822247; Mon, 28 Oct 2013 02:50:22 -0700 (PDT) Received: from nashorn.home (188-22-235-27.adsl.highway.telekom.at. [188.22.235.27]) by mx.google.com with ESMTPSA id e1sm33982300wij.6.2013.10.28.02.50.16 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 Oct 2013 02:50:21 -0700 (PDT) From: Phil Eichinger To: buildroot@busybox.net Date: Mon, 28 Oct 2013 10:47:27 +0100 Message-Id: <1382953647-10451-1-git-send-email-phil@zankapfel.net> X-Mailer: git-send-email 1.7.10.4 Cc: Phil Eichinger Subject: [Buildroot] [PATCH v2 1/1] valgrind: add support for glibc 2.17 and 2.18 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: http://autobuild.buildroot.net/results/f086e65aca220bc9a5869f8fc8c1dca4d87ada7d/ Signed-off-by: Phil Eichinger Acked-by: Arnout Vandecappelle (Essensium/Mind) --- Changes from v1: * added reference to upstream revisions in patch * fixed commit log ...grind-add-support-for-glibc-2.17-and-2.18.patch | 50 ++++++++++++++++++++ package/valgrind/valgrind.mk | 2 +- 2 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 package/valgrind/valgrind-add-support-for-glibc-2.17-and-2.18.patch diff --git a/package/valgrind/valgrind-add-support-for-glibc-2.17-and-2.18.patch b/package/valgrind/valgrind-add-support-for-glibc-2.17-and-2.18.patch new file mode 100644 index 0000000..c07dda2 --- /dev/null +++ b/package/valgrind/valgrind-add-support-for-glibc-2.17-and-2.18.patch @@ -0,0 +1,50 @@ +From bca21896dbdba12963aa7991d7f1b732b6a709a8 Mon Sep 17 00:00:00 2001 +From: Phil Eichinger +Date: Wed, 23 Oct 2013 18:28:15 +0200 +Subject: [PATCH 1/1] Add support for glibc 2.17 and 2.18. + + +Signed-off-by: Phil Eichinger +--- +Status: fixed in upstream r13228 & r13504, not yet released. + + configure.in | 16 +++++++++++++++- + 1 file changed, 15 insertions(+), 1 deletion(-) + +diff --git a/configure.in b/configure.in +index 1da3a2c..ccc60a0 100644 +--- a/configure.in ++++ b/configure.in +@@ -906,6 +906,20 @@ case "${GLIBC_VERSION}" in + DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" + DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" + ;; ++ 2.17) ++ AC_MSG_RESULT(2.17 family) ++ AC_DEFINE([GLIBC_2_17], 1, [Define to 1 if you're using glibc 2.17.x]) ++ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" ++ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" ++ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" ++ ;; ++ 2.18) ++ AC_MSG_RESULT(2.18 family) ++ AC_DEFINE([GLIBC_2_18], 1, [Define to 1 if you're using glibc 2.18.x]) ++ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" ++ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" ++ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" ++ ;; + darwin) + AC_MSG_RESULT(Darwin) + AC_DEFINE([DARWIN_LIBC], 1, [Define to 1 if you're using Darwin]) +@@ -919,7 +933,7 @@ case "${GLIBC_VERSION}" in + + *) + AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}]) +- AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.16]) ++ AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.18]) + AC_MSG_ERROR([or Darwin libc]) + ;; + esac +-- +1.7.10.4 + diff --git a/package/valgrind/valgrind.mk b/package/valgrind/valgrind.mk index f40784e..953f929 100644 --- a/package/valgrind/valgrind.mk +++ b/package/valgrind/valgrind.mk @@ -9,7 +9,7 @@ VALGRIND_SITE = http://valgrind.org/downloads/ VALGRIND_SOURCE = valgrind-$(VALGRIND_VERSION).tar.bz2 VALGRIND_LICENSE = GPLv2 GFDLv1.2 VALGRIND_LICENSE_FILES = COPYING COPYING.DOCS - +VALGRIND_AUTORECONF = YES VALGRIND_CONF_OPT = --disable-tls # On ARM, Valgrind only supports ARMv7, and uses the arch part of the