From mboxrd@z Thu Jan 1 00:00:00 1970 From: Leo Famulari Subject: [PATCH 1/1] gnu: perl-www-curl: Fix build failure. Date: Mon, 24 Oct 2016 18:44:27 -0400 Message-ID: <18c9df2577a6524d80422f74e417b4a11894cdc8.1477348992.git.leo@famulari.name> References: Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:56099) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bynyz-0001Pc-Fc for guix-devel@gnu.org; Mon, 24 Oct 2016 18:44:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bynyw-0000lf-55 for guix-devel@gnu.org; Mon, 24 Oct 2016 18:44:41 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:44674) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1bynyw-0000lO-1F for guix-devel@gnu.org; Mon, 24 Oct 2016 18:44:38 -0400 Received: from localhost.localdomain (c-73-188-17-148.hsd1.pa.comcast.net [73.188.17.148]) by mail.messagingengine.com (Postfix) with ESMTPA id 8D121CC083 for ; Mon, 24 Oct 2016 18:44:35 -0400 (EDT) In-Reply-To: In-Reply-To: References: List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org * gnu/packages/patches/perl-www-curl-remove-symbol.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/web.scm (perl-www-curl)[source]: Use it. --- gnu/local.mk | 1 + .../patches/perl-www-curl-remove-symbol.patch | 39 ++++++++++++++++++++++ gnu/packages/web.scm | 1 + 3 files changed, 41 insertions(+) create mode 100644 gnu/packages/patches/perl-www-curl-remove-symbol.patch diff --git a/gnu/local.mk b/gnu/local.mk index adccab3..49d2909 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -750,6 +750,7 @@ dist_patch_DATA = \ %D%/packages/patches/perl-no-sys-dirs.patch \ %D%/packages/patches/perl-module-pluggable-search.patch \ %D%/packages/patches/perl-reproducible-build-date.patch \ + %D%/packages/patches/perl-www-curl-remove-symbol.patch \ %D%/packages/patches/pidgin-add-search-path.patch \ %D%/packages/patches/pinball-const-fix.patch \ %D%/packages/patches/pinball-cstddef.patch \ diff --git a/gnu/packages/patches/perl-www-curl-remove-symbol.patch b/gnu/packages/patches/perl-www-curl-remove-symbol.patch new file mode 100644 index 0000000..3fa0f56 --- /dev/null +++ b/gnu/packages/patches/perl-www-curl-remove-symbol.patch @@ -0,0 +1,39 @@ +Fix build failure caused by extraneous preprocessor symbol. + +Patch copied from upstream bug report: +https://rt.cpan.org/Public/Bug/Display.html?id=117793 + +From 0be0223422e6e5f4091c6e4e058d213623eed105 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= +Date: Mon, 12 Sep 2016 14:40:44 +0200 +Subject: [PATCH] Skip preprocessor symbol only CURL_STRICTER +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +CURL_STRICTER leaked into curl-constants.c when building against +curl-7.50.2. This is a preprocessor only macro without a value. + +CPAN RT#117793 + +Signed-off-by: Petr Písař +--- + Makefile.PL | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.PL b/Makefile.PL +index f9170bb..ad2bd3d 100644 +--- a/Makefile.PL ++++ b/Makefile.PL +@@ -127,7 +127,7 @@ if (!defined($curl_h)) { + close H; + + for my $e (sort @syms) { +- if($e =~ /(OBSOLETE|^CURL_EXTERN|_LAST\z|_LASTENTRY\z)/) { ++ if($e =~ /(OBSOLETE|^CURL_EXTERN|^CURL_STRICTER\z|_LAST\z|_LASTENTRY\z)/) { + next; + } + my ($group) = $e =~ m/^([^_]+_)/; +-- +2.7.4 + diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index cabf1e6..60f1f73 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -3053,6 +3053,7 @@ RFC 6570.") (uri (string-append "mirror://cpan/authors/id/S/SZ/SZBALINT/WWW-Curl-" version".tar.gz")) + (patches (search-patches "perl-www-curl-remove-symbol.patch")) (sha256 (base32 "1fmp9aib1kaps9vhs4dwxn7b15kgnlz9f714bxvqsd1j1q8spzsj")))) -- 2.10.1