diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-09-23 20:25:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-23 20:25:45 +0200 |
| commit | fda18e432e352d61195a193746587a81b0bc89b9 (patch) | |
| tree | d49503a8aa4970b41ab34efed3fef8ff31df0fdb | |
| parent | a8d4f747a4ffe6b053f066bcef8d30d321c54fb6 (diff) | |
| parent | 123f81b866794dd70924bde4f2f5295e49e78be6 (diff) | |
Merge pull request #18889 from groxxda/wwwcurl
perlPackages.WWWCurl: fix broken build after curl update
| -rw-r--r-- | pkgs/development/perl-modules/WWW-Curl-4.17-Skip-preprocessor-symbol-only-CURL_STRICTER.patch | 34 | ||||
| -rw-r--r-- | pkgs/top-level/perl-packages.nix | 1 |
2 files changed, 35 insertions, 0 deletions
diff --git a/pkgs/development/perl-modules/WWW-Curl-4.17-Skip-preprocessor-symbol-only-CURL_STRICTER.patch b/pkgs/development/perl-modules/WWW-Curl-4.17-Skip-preprocessor-symbol-only-CURL_STRICTER.patch new file mode 100644 index 0000000000000..34221c0d20c79 --- /dev/null +++ b/pkgs/development/perl-modules/WWW-Curl-4.17-Skip-preprocessor-symbol-only-CURL_STRICTER.patch @@ -0,0 +1,34 @@ +From 0be0223422e6e5f4091c6e4e058d213623eed105 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com> +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ř <ppisar@redhat.com> +--- + 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/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e00b134d6da35..c3c2bd1e1f6fb 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14174,6 +14174,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/S/SZ/SZBALINT/${name}.tar.gz"; sha256 = "1fmp9aib1kaps9vhs4dwxn7b15kgnlz9f714bxvqsd1j1q8spzsj"; }; + patches = [ ../development/perl-modules/WWW-Curl-4.17-Skip-preprocessor-symbol-only-CURL_STRICTER.patch ]; buildInputs = [ pkgs.curl ]; preConfigure = '' |