Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Perl fix 17 #10379

Merged
merged 5 commits into from
Aug 12, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions build-fail-blacklist
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@ recipes/samtools/1.1
# need to fix the download location, the checksum changes everytime
recipes/osra/2.1.0

# wrong shebang
# recipes/perl-image-exiftool

# osx failures
recipes/cgat-scripts
#recipes/perl-io-compress
Expand Down Expand Up @@ -2131,7 +2128,6 @@ recipes/ntcard
recipes/ocrad/0.21
recipes/panoct
recipes/perl-estscan1/1.3
recipes/perl-text-nsp
recipes/pygresql
recipes/real
recipes/rmap
Expand All @@ -2155,7 +2151,6 @@ recipes/perl-log-log4perl
recipes/perl-moosex-getopt
recipes/perl-moosex-types-path-class
#recipes/perl-params-validationcompiler/0.23
recipes/perl-test-output
recipes/carna
recipes/perl-json-create
recipes/perl-moosex-app/1.39
Expand Down
8 changes: 3 additions & 5 deletions recipes/perl-image-exiftool/build.sh
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
#!/bin/bash

set -x -e

sed -i.bak 's^/usr/bin/perl -w^/usr/bin/env perl^' exiftool

# If it has Build.PL use that, otherwise use Makefile.PL
if [ -f Build.PL ]; then
perl Build.PL
perl ./Build
perl ./Build test
# Make sure this goes in site
perl ./Build install --installdirs site
elif [ -f Makefile.PL ]; then
# Make sure this goes in site
Expand All @@ -20,6 +20,4 @@ else
exit 1
fi

sed -i.bak 's/perl -w/perl/' `which exiftool`
rm ${PREFIX}/bin/exiftool.bak
chmod 777 ${PREFIX}/bin/exiftool
chmod u+rwx $PREFIX/bin/*
18 changes: 10 additions & 8 deletions recipes/perl-image-exiftool/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,33 +1,35 @@
{% set version = "10.40" %}
{% set sha256 = "9e3619e2f9c838b37f67ab55fd541b5472b328d5f464468442367292666a05dc" %}
{% set name = "perl-image-exiftool" %}
{% set version = "11.01" %}
{% set sha256 = "705fbf4a42d772c548afff4c64b3db3e95eb347e5b48acd66dd7d7712c19bc9c" %}

package:
name: perl-image-exiftool
name: {{ name }}
version: {{ version }}

source:
url: http://search.cpan.org/CPAN/authors/id/E/EX/EXIFTOOL/Image-ExifTool-{{ version }}.tar.gz
url: https://cpan.metacpan.org/authors/id/E/EX/EXIFTOOL/Image-ExifTool-11.01.tar.gz
sha256: {{ sha256 }}

build:
number: 2
number: 0

requirements:
host:
build:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@druvus this looks wrong to me. I thought the build environment is just for compiler and build-tools like cmake.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks, good catch! It was a typo from the skeleton that I missed.

- perl
- perl-extutils-makemaker

run:
- perl

test:
# Perl 'use' tests
imports:
- Image::ExifTool

commands:
- exiftool -ver

about:
home: http://www.sno.phy.queensu.ca/~phil/exiftool
home: http://metacpan.org/pod/Image::ExifTool
license: perl_5
summary: 'ExifTool is a platform-independent Perl library plus a command-line application for reading, writing and editing meta information in a wide variety of files.'

11 changes: 3 additions & 8 deletions recipes/perl-test-output/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -18,8 +18,3 @@ 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.
24 changes: 13 additions & 11 deletions recipes/perl-test-output/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,33 +1,35 @@
{% set name = "perl-test-output" %}
{% set version = "1.031" %}
{% set sha256 = "f8b8f37185717872727d06f6c078fa77db794410faf2f6da4d37b0b7650f7ea4" %}

package:
name: perl-test-output
version: "1.03"
name: {{ name }}
version: {{ version }}

source:
url: http://cpan.metacpan.org/authors/id/B/BD/BDFOY/Test-Output-1.03.tar.gz
md5: 903485edb382f5a18a5029978d1febf6
url: https://cpan.metacpan.org/authors/id/B/BD/BDFOY/Test-Output-1.031.tar.gz
sha256: {{ sha256 }}

build:
number: 1
number: 0

requirements:
host:
- perl
- perl-extutils-makemaker
- perl-sub-exporter
- perl-capture-tiny
- perl-test-simple
- perl-file-temp
- perl-extutils-makemaker

run:
- perl
- perl-capture-tiny
- perl-sub-exporter
- perl-test-simple
- perl-file-temp

test:
imports:
- Test::Output

about:
home: http://metacpan.org/pod/Test-Output
home: https://github.com/briandfoy/test-output
license: perl_5
summary: 'Utilities to test STDOUT and STDERR messages.'
8 changes: 5 additions & 3 deletions recipes/perl-text-nsp/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -17,3 +17,5 @@ else
echo 'Unable to find Build.PL or Makefile.PL. You need to modify build.sh.'
exit 1
fi

chmod u+rwx $PREFIX/bin/*
19 changes: 12 additions & 7 deletions recipes/perl-text-nsp/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,26 +1,31 @@
{% set name = "perl-text-nsp" %}
{% set version = "1.31" %}
{% set sha256 = "a01201beb29636b3e41ecda2a6cf6522fd265416bd6d994fad02f59fb49cf595" %}

package:
name: perl-text-nsp
version: "1.31"
name: {{ name }}
version: {{ version }}

source:
url: https://cpan.metacpan.org/authors/id/T/TP/TPEDERSE/Text-NSP-1.31.tar.gz
md5: ed15ed2f35947c0a486fa9751f339b09
sha256: {{ sha256 }}

build:
number: 1
number: 2

requirements:
host:
- perl
- perl-extutils-makemaker

run:
- perl

test:
# Perl 'use' tests: relying on "run_test.pl" due to version differences
# between the top-level and sub- packages.
imports:
- Text::NSP

about:
home: http://metacpan.org/pod/Text-NSP
home: http://metacpan.org/pod/Text::NSP
license: open_source
summary: 'Extract collocations and Ngrams from text'