From 4fc034b6cfc4e63da2c6a5d61394beb7906a44f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Sj=C3=B6din?= Date: Sat, 28 Jul 2018 23:15:14 +0200 Subject: [PATCH] Fix 2 perl packages --- build-fail-blacklist | 2 -- recipes/perl-perl-version/build.sh | 12 +++------ recipes/perl-perl-version/meta.yaml | 42 +++++++++++------------------ recipes/perl-type-tiny/build.sh | 6 ++--- recipes/perl-type-tiny/meta.yaml | 20 ++++++++------ 5 files changed, 34 insertions(+), 48 deletions(-) diff --git a/build-fail-blacklist b/build-fail-blacklist index 1bde4f0f9d586..559850e2f8dc2 100644 --- a/build-fail-blacklist +++ b/build-fail-blacklist @@ -2046,7 +2046,6 @@ recipes/perl-locale-maketext-simple/0.21 recipes/perl-xml-libxslt recipes/perl-math-spline recipes/perl-spreadsheet-writeexcel -recipes/perl-type-tiny recipes/perl-list-someutils/0.53 recipes/perl-convert-binhex recipes/perl-go-perl @@ -2245,7 +2244,6 @@ recipes/perl-vcftools-vcf recipes/perl-module-scandeps/1.23 recipes/perl-image-size recipes/perl-gdtextutil -recipes/perl-perl-version recipes/perl-dbi recipes/perl-hash-util-fieldhash-compat/0.11 recipes/perl-file-homedir diff --git a/recipes/perl-perl-version/build.sh b/recipes/perl-perl-version/build.sh index 214d4ca5106ec..9347462eabc6d 100644 --- a/recipes/perl-perl-version/build.sh +++ b/recipes/perl-perl-version/build.sh @@ -3,10 +3,10 @@ # If it has Build.PL use that, otherwise use Makefile.PL if [ -f Build.PL ]; then perl Build.PL - ./Build - ./Build test + perl ./Build + perl ./Build test # Make sure this goes in site - ./Build install --installdirs site + perl ./Build install --installdirs site elif [ -f Makefile.PL ]; then # Make sure this goes in site perl Makefile.PL INSTALLDIRS=site @@ -18,8 +18,4 @@ else exit 1 fi -# Add more build steps here, if they are necessary. - -# See -# http://docs.continuum.io/conda/build.html -# for a list of environment variables that are set during the build process. +chmod 755 ${PREFIX}/bin/perl-reversion || echo "could not change file permissions" diff --git a/recipes/perl-perl-version/meta.yaml b/recipes/perl-perl-version/meta.yaml index 2e682fd2bcec3..bc8b99c3c9e87 100644 --- a/recipes/perl-perl-version/meta.yaml +++ b/recipes/perl-perl-version/meta.yaml @@ -1,53 +1,41 @@ -package: - name: perl-perl-version - version: "1.013" +{% set name = "perl-perl-version" %} +{% set version = "1.013" %} +{% set sha256 = "1887414d1c8689d864c840114101e043e99d7dd5b9cca69369a60e821e3ad0f7" %} -build: - number: 1 +package: + name: {{ name }} + version: {{ version }} source: - url: http://cpan.metacpan.org/authors/id/B/BD/BDFOY/Perl-Version-1.013.tar.gz - md5: 8955a7292d1039f01d76272464812b0e -# patches: - # List any patch files here - # - fix.patch + url: https://cpan.metacpan.org/authors/id/B/BD/BDFOY/Perl-Version-1.013.tar.gz + sha256: {{ sha256 }} build: - number: 1 + number: 2 requirements: host: - perl - - perl-test-simple - - perl-scalar-list-utils + - perl-pod-usage - perl-file-slurp-tiny - perl-extutils-makemaker - perl-getopt-long + - perl-data-dumper + - perl-carp run: - perl - - perl-test-simple - - perl-scalar-list-utils + - perl-carp - perl-file-slurp-tiny - perl-getopt-long + - perl-data-dumper + - perl-pod-usage test: - # Perl 'use' tests imports: - Perl::Version - # You can also put a file called run_test.pl (or run_test.py) in the recipe - # that will be run at test time. - - # requires: - # Put any additional test requirements here. For example - # - nose - about: home: http://metacpan.org/pod/Perl::Version license: perl_5 summary: 'Parse and manipulate Perl version strings' - -# See -# http://docs.continuum.io/conda/build.html for -# more information about meta.yaml diff --git a/recipes/perl-type-tiny/build.sh b/recipes/perl-type-tiny/build.sh index 64652ea2132d9..67918fe672fe6 100644 --- a/recipes/perl-type-tiny/build.sh +++ b/recipes/perl-type-tiny/build.sh @@ -3,10 +3,10 @@ # If it has Build.PL use that, otherwise use Makefile.PL if [ -f Build.PL ]; then perl Build.PL - ./Build - ./Build test + perl ./Build + perl ./Build test # Make sure this goes in site - ./Build install --installdirs site + perl ./Build install --installdirs site elif [ -f Makefile.PL ]; then # Make sure this goes in site perl Makefile.PL INSTALLDIRS=site diff --git a/recipes/perl-type-tiny/meta.yaml b/recipes/perl-type-tiny/meta.yaml index 01c99ff98ea79..3815bed1bc432 100644 --- a/recipes/perl-type-tiny/meta.yaml +++ b/recipes/perl-type-tiny/meta.yaml @@ -1,29 +1,32 @@ +{% set name = "perl-type-tiny" %} +{% set version = "1.002002" %} +{% set sha256 = "a85b0c8f99b5c9b5558f0bcc8893b44299fcccf3c264ff924940d09d91d8882c" %} + package: - name: perl-type-tiny - version: "1.000005" + name: {{ name }} + version: {{ version }} source: - url: https://cpan.metacpan.org/authors/id/T/TO/TOBYINK/Type-Tiny-1.000005.tar.gz - md5: 2914b0e6b35c35f657d426fba29b4520 + url: https://cpan.metacpan.org/authors/id/T/TO/TOBYINK/Type-Tiny-1.002002.tar.gz + sha256: {{ sha256 }} build: - number: 1 + number: 0 requirements: host: - perl - perl-exporter-tiny - - perl-moo # for testing compatibility + - perl-extutils-makemaker run: - perl - perl-exporter-tiny test: - # Perl 'use' tests imports: - Type::Coercion - #- Type::Coercion::FromMoose + - Type::Coercion::FromMoose - Type::Coercion::Union - Type::Library - Type::Params @@ -41,6 +44,7 @@ test: - Types::Common::String - Types::Standard - Types::Standard::ArrayRef + - Types::Standard::CycleTuple - Types::Standard::Dict - Types::Standard::HashRef - Types::Standard::Map