From patchwork Fri Dec 28 12:07:36 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Zacarias X-Patchwork-Id: 208478 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 3953C2C0091 for ; Fri, 28 Dec 2012 23:08:01 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 382A1A00D4; Fri, 28 Dec 2012 12:08:00 +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 KFzVQ3gmmZTX; Fri, 28 Dec 2012 12:07:57 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id B0DFEA003C; Fri, 28 Dec 2012 12:07:57 +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 3BEC88F74B for ; Fri, 28 Dec 2012 12:07:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 5090C822C4 for ; Fri, 28 Dec 2012 12:07:53 +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 T8YC5osGViJi for ; Fri, 28 Dec 2012 12:07:51 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from loknar.toptech.com.ar (loknar.toptech.com.ar [78.46.79.162]) by whitealder.osuosl.org (Postfix) with ESMTPS id 2E65A8AA4B for ; Fri, 28 Dec 2012 12:07:50 +0000 (UTC) Received: from asgard (host204.190-231-107.telecom.net.ar [190.231.107.204]) (authenticated bits=0) by loknar.toptech.com.ar (8.14.5/8.14.5) with ESMTP id qBSC7iLT020554 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 28 Dec 2012 12:07:46 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=zacarias.com.ar; s=dkey; t=1356696468; bh=if77DUucdH+B1blEueAfTk1CBdKeVx2J/8y7HKqlVKM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=c/Y4ZedMk/odbVzSFMMnL594tvvWYnPHlLCpNBfq/IeR6zvCmdCCgXA6dZ3IY8X/K v8c+SGZexutgeFF19uQzwr6JCHXS1PInyybffxGsWOMv+qsyj9ZFoUrI2dGGV3NmoP zny3UskCJdy9e9WsH5SN0xRSwqWhgGjg3Wgj5ARk= Received: by asgard (sSMTP sendmail emulation); Fri, 28 Dec 2012 09:07:43 -0300 From: Gustavo Zacarias To: buildroot@busybox.net Date: Fri, 28 Dec 2012 09:07:36 -0300 Message-Id: <1356696457-12445-2-git-send-email-gustavo@zacarias.com.ar> X-Mailer: git-send-email 1.7.8.6 In-Reply-To: <1356696457-12445-1-git-send-email-gustavo@zacarias.com.ar> References: <1356696457-12445-1-git-send-email-gustavo@zacarias.com.ar> X-Virus-Scanned: clamav-milter 0.97.5 at loknar X-Virus-Status: Clean Subject: [Buildroot] [PATCH 2/3] pcre: bump to version 8.32 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 Bump PCRE to version 8.32 Also add a patch to remove compatibility bits, fixing: http://autobuild.buildroot.net/results/e380b838296c85ff9aeaec9fa088bded69670307/ Signed-off-by: Gustavo Zacarias --- package/pcre/pcre-no-compat.patch | 31 +++++++++++++++++++++++++++++++ package/pcre/pcre.mk | 2 +- 2 files changed, 32 insertions(+), 1 deletions(-) create mode 100644 package/pcre/pcre-no-compat.patch diff --git a/package/pcre/pcre-no-compat.patch b/package/pcre/pcre-no-compat.patch new file mode 100644 index 0000000..7099727 --- /dev/null +++ b/package/pcre/pcre-no-compat.patch @@ -0,0 +1,31 @@ +Kill ABI compatibility bits, we don't need them. +Fixes build failures on non-ELF (blackfin) targets. + +Signed-off-by: Gustavo Zacarias + +diff -Nura pcre-8.32.orig/pcrecpp.cc pcre-8.32/pcrecpp.cc +--- pcre-8.32.orig/pcrecpp.cc 2012-12-28 08:32:10.193847937 -0300 ++++ pcre-8.32/pcrecpp.cc 2012-12-28 08:32:26.924376180 -0300 +@@ -58,22 +58,6 @@ + // Special object that stands-in for no argument + Arg RE::no_arg((void*)NULL); + +-// This is for ABI compatibility with old versions of pcre (pre-7.6), +-// which defined a global no_arg variable instead of putting it in the +-// RE class. This works on GCC >= 3, at least. It definitely works +-// for ELF, but may not for other object formats (Mach-O, for +-// instance, does not support aliases.) We could probably have a more +-// inclusive test if we ever needed it. (Note that not only the +-// __attribute__ syntax, but also __USER_LABEL_PREFIX__, are +-// gnu-specific.) +-#if defined(__GNUC__) && __GNUC__ >= 3 && defined(__ELF__) +-# define ULP_AS_STRING(x) ULP_AS_STRING_INTERNAL(x) +-# define ULP_AS_STRING_INTERNAL(x) #x +-# define USER_LABEL_PREFIX_STR ULP_AS_STRING(__USER_LABEL_PREFIX__) +-extern Arg no_arg +- __attribute__((alias(USER_LABEL_PREFIX_STR "_ZN7pcrecpp2RE6no_argE"))); +-#endif +- + // If a regular expression has no error, its error_ field points here + static const string empty_string; + diff --git a/package/pcre/pcre.mk b/package/pcre/pcre.mk index 9947c4b..9e27cb5 100644 --- a/package/pcre/pcre.mk +++ b/package/pcre/pcre.mk @@ -4,7 +4,7 @@ # ############################################################# -PCRE_VERSION = 8.31 +PCRE_VERSION = 8.32 PCRE_SITE = ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre PCRE_LICENSE = BSD-3c PCRE_LICENSE_FILES = LICENCE