diff options
| author | Breno Leitao <breno.leitao@gmail.com> | 2017-04-18 20:23:54 +0000 |
|---|---|---|
| committer | Breno Leitao <breno.leitao@gmail.com> | 2017-04-18 20:32:56 +0000 |
| commit | 5ddc0b335e8187f21743eccf8eaa1cd9ec7e700b (patch) | |
| tree | fcc6b6d2875767613cdb1f6567b2a54b75fc7848 /testing | |
| parent | 9ffa2b9c245d7e8f531cbf44d1cc99ba1f2a2b45 (diff) | |
| download | aports-5ddc0b335e8187f21743eccf8eaa1cd9ec7e700b.tar.bz2 aports-5ddc0b335e8187f21743eccf8eaa1cd9ec7e700b.tar.xz | |
testing/perl-www-curl: Fix issue on build
Perl-www-curl version 4.17 has an upstream issue that causes the
following error:
curlopt-constants.c:128:49: error: 'CURL_STRICTER' undeclared (first use in this function)
if (strEQ(name, "STRICTER")) return CURL_STRICTER;
This was fixed upstream on the following commit:
https://anonscm.debian.org/cgit/pkg-perl/packages/libwww-curl-perl.git/commit/?id=d83b9f7
Cherry-picking this patch to Alpine.
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/perl-www-curl/APKBUILD | 17 | ||||
| -rw-r--r-- | testing/perl-www-curl/WWW-Curl-4.17-RT117793.patch | 25 |
2 files changed, 34 insertions, 8 deletions
diff --git a/testing/perl-www-curl/APKBUILD b/testing/perl-www-curl/APKBUILD index 5fc5a058a6..5dd01a0a35 100644 --- a/testing/perl-www-curl/APKBUILD +++ b/testing/perl-www-curl/APKBUILD @@ -14,28 +14,29 @@ cpanmakedepends=" " depends="$cpandepends" makedepends="perl-dev $cpanmakedepends curl-dev" subpackages="$pkgname-doc" -source="http://search.cpan.org/CPAN/authors/id/S/SZ/SZBALINT/$_pkgreal-$pkgver.tar.gz" +source="http://search.cpan.org/CPAN/authors/id/S/SZ/SZBALINT/$_pkgreal-$pkgver.tar.gz + WWW-Curl-4.17-RT117793.patch" -_builddir="$srcdir/$_pkgreal-$pkgver" +builddir="$srcdir/$_pkgreal-$pkgver" prepare() { - cd "$_builddir" + default_prepare + cd "$builddir" export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'` PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor } build() { - cd "$_builddir" + cd "$builddir" export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'` make && make test } package() { - cd "$_builddir" + cd "$builddir" make DESTDIR="$pkgdir" install || return 1 find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -md5sums="997ac81cd6b03b30b36f7cd930474845 WWW-Curl-4.17.tar.gz" -sha256sums="52ffab110e32348d775f241c973eb56f96b08eedbc110d77d257cdb0a24ab7ba WWW-Curl-4.17.tar.gz" -sha512sums="bc7a75d0e23f5a77578fd7244b56a1e1b81d814993b90ac7132926f0d571232c4c95875bc615cb6239e424ae1d5481d27796efc5376bb0845d1da0ff1137c0d6 WWW-Curl-4.17.tar.gz" +sha512sums="bc7a75d0e23f5a77578fd7244b56a1e1b81d814993b90ac7132926f0d571232c4c95875bc615cb6239e424ae1d5481d27796efc5376bb0845d1da0ff1137c0d6 WWW-Curl-4.17.tar.gz +d92cb37435d66867578818776f3ef64f4f6295515639d9bf860907ad28ca4109435c45174b49bdeb594a0cddafcc3f833c41d15d641eadfbbec598b77a1e90df WWW-Curl-4.17-RT117793.patch" diff --git a/testing/perl-www-curl/WWW-Curl-4.17-RT117793.patch b/testing/perl-www-curl/WWW-Curl-4.17-RT117793.patch new file mode 100644 index 0000000000..e89d237ea2 --- /dev/null +++ b/testing/perl-www-curl/WWW-Curl-4.17-RT117793.patch @@ -0,0 +1,25 @@ +From 292c05a8aa9c18bd27d0aaff0b4ee601d9b87b92 Mon Sep 17 00:00:00 2001 +From: Slaven Rezic <cpansand@cvrsnica-freebsd-101.herceg.de> +Date: Sun, 16 Apr 2017 22:17:00 +0200 +Subject: [PATCH] compilation fixes for curl 7.50.2 and newer (RT #117793) + +--- + Makefile.PL | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.PL b/Makefile.PL +index f9170bb..bb852e4 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|^CURL_DID_MEMORY_FUNC_TYPEDEFS\z|_LAST\z|_LASTENTRY\z)/) { + next; + } + my ($group) = $e =~ m/^([^_]+_)/; +-- +2.1.2 + |