From a0ecbfbaef8e1c602b849f07d410bd09d1c41370 Mon Sep 17 00:00:00 2001 From: Anthony Bretaudeau Date: Tue, 7 Aug 2018 21:45:12 +0200 Subject: [PATCH 01/11] more unblacklisting --- build-fail-blacklist | 5 ----- recipes/perl-bio-phylo/meta.yaml | 4 ++++ 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/build-fail-blacklist b/build-fail-blacklist index 8bb8decbedb2b..408fc61bcbd3d 100644 --- a/build-fail-blacklist +++ b/build-fail-blacklist @@ -1556,7 +1556,6 @@ recipes/qiime/1.9.1 recipes/sprai # missing perl dep -recipes/perl-bio-phylo recipes/perl-text-ansitable/0.48 # missing tarballs @@ -1983,7 +1982,6 @@ recipes/perl-estscan2/2.1 # /opt/conda/conda-bld/perl-error_1530981443167/work/conda_build.sh: ./Build: /opt/conda/conda-bld/perl-error_1530981443167/_h_env_placehold_placehold_plac: bad interpreter: No such file or directory recipes/perl-io-socket-inet6 #recipes/perl-path-class -recipes/perl-graphviz recipes/perl-ppi/1.236 recipes/perl-term-app-roles @@ -2108,9 +2106,6 @@ recipes/metaprob recipes/cap-mirseq # Temporary disable until #10287 is merged -recipes/perl-data-stag -recipes/perl-xml-dom-xpath -recipes/perl-test-xml recipes/perl-soap-lite recipes/perl-lwp-protocol-https diff --git a/recipes/perl-bio-phylo/meta.yaml b/recipes/perl-bio-phylo/meta.yaml index ef884ee7119e2..2c56811aa4cdd 100644 --- a/recipes/perl-bio-phylo/meta.yaml +++ b/recipes/perl-bio-phylo/meta.yaml @@ -28,6 +28,8 @@ requirements: - perl-xml-twig - perl-template-toolkit #- perl-xml-xml2json + - perl-uri + - perl-lwp-simple run: - perl @@ -42,6 +44,8 @@ requirements: - perl-xml-twig - perl-template-toolkit #- perl-xml-xml2json + - perl-uri + - perl-lwp-simple test: # Perl 'use' tests From adfa016692348d78433da072cadd6fe84c4af91c Mon Sep 17 00:00:00 2001 From: Anthony Bretaudeau Date: Tue, 7 Aug 2018 21:46:34 +0200 Subject: [PATCH 02/11] graphviz --- build-fail-blacklist | 1 + 1 file changed, 1 insertion(+) diff --git a/build-fail-blacklist b/build-fail-blacklist index 408fc61bcbd3d..57839d6023521 100644 --- a/build-fail-blacklist +++ b/build-fail-blacklist @@ -1982,6 +1982,7 @@ recipes/perl-estscan2/2.1 # /opt/conda/conda-bld/perl-error_1530981443167/work/conda_build.sh: ./Build: /opt/conda/conda-bld/perl-error_1530981443167/_h_env_placehold_placehold_plac: bad interpreter: No such file or directory recipes/perl-io-socket-inet6 #recipes/perl-path-class +recipes/perl-graphviz recipes/perl-ppi/1.236 recipes/perl-term-app-roles From 61c5e2e01d5ae62e3e1ca272bebf643977c826bb Mon Sep 17 00:00:00 2001 From: Anthony Bretaudeau Date: Tue, 7 Aug 2018 22:13:12 +0200 Subject: [PATCH 03/11] fix --- recipes/perl-test-xml/build.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes/perl-test-xml/build.sh b/recipes/perl-test-xml/build.sh index 64652ea2132d9..67918fe672fe6 100644 --- a/recipes/perl-test-xml/build.sh +++ b/recipes/perl-test-xml/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 From 29d3ee8d9ea896d51a229745b5762d70ead4a142 Mon Sep 17 00:00:00 2001 From: Anthony Bretaudeau Date: Tue, 7 Aug 2018 23:08:53 +0200 Subject: [PATCH 04/11] mac build --- build-fail-blacklist | 1 - recipes/perl-io-string/meta.yaml | 2 +- recipes/perl-json-xs/meta.yaml | 2 +- recipes/perl-xml-sax-writer/meta.yaml | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/build-fail-blacklist b/build-fail-blacklist index 57839d6023521..708c0da40e94f 100644 --- a/build-fail-blacklist +++ b/build-fail-blacklist @@ -2214,7 +2214,6 @@ recipes/perl-log-log4perl recipes/perl-moosex-getopt recipes/perl-moosex-types-path-class #recipes/perl-params-validationcompiler/0.23 -recipes/perl-template-toolkit recipes/perl-test-output recipes/carna recipes/perl-excel-writer-xlsx diff --git a/recipes/perl-io-string/meta.yaml b/recipes/perl-io-string/meta.yaml index 203745e63434c..8ce39a3fdcd92 100644 --- a/recipes/perl-io-string/meta.yaml +++ b/recipes/perl-io-string/meta.yaml @@ -7,7 +7,7 @@ source: md5: 250e5424f290299fc3d6b5d1e9da3835 build: - number: 2 + number: 3 requirements: host: diff --git a/recipes/perl-json-xs/meta.yaml b/recipes/perl-json-xs/meta.yaml index 42826267b4b98..6b59b555ac84e 100644 --- a/recipes/perl-json-xs/meta.yaml +++ b/recipes/perl-json-xs/meta.yaml @@ -11,7 +11,7 @@ source: sha256: {{ sha256 }} build: - number: 0 + number: 1 requirements: build: diff --git a/recipes/perl-xml-sax-writer/meta.yaml b/recipes/perl-xml-sax-writer/meta.yaml index 183f0f31f6904..bcccf3d2891b2 100644 --- a/recipes/perl-xml-sax-writer/meta.yaml +++ b/recipes/perl-xml-sax-writer/meta.yaml @@ -7,7 +7,7 @@ source: md5: e5fa5e2b2f6867b1aca9b5b43e1ce361 build: - number: 1 + number: 2 requirements: host: From adfcb01cac71ca56bf05632354a1f37bac01c8d2 Mon Sep 17 00:00:00 2001 From: Anthony Bretaudeau Date: Tue, 7 Aug 2018 23:13:38 +0200 Subject: [PATCH 05/11] mac build --- recipes/perl-io-string/meta.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/recipes/perl-io-string/meta.yaml b/recipes/perl-io-string/meta.yaml index 8ce39a3fdcd92..8f7d8d6963a63 100644 --- a/recipes/perl-io-string/meta.yaml +++ b/recipes/perl-io-string/meta.yaml @@ -16,6 +16,10 @@ requirements: run: - perl +test: + imports: + - IO::String + about: home: http://metacpan.org/pod/IO-String license: unknown From 84f9ca78a18868341e74c2b30f8f16853aa135fd Mon Sep 17 00:00:00 2001 From: Anthony Bretaudeau Date: Wed, 8 Aug 2018 09:37:27 +0200 Subject: [PATCH 06/11] perm --- recipes/perl-template-toolkit/build.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes/perl-template-toolkit/build.sh b/recipes/perl-template-toolkit/build.sh index 3ea03c9c0523e..e49b3113fa634 100644 --- a/recipes/perl-template-toolkit/build.sh +++ b/recipes/perl-template-toolkit/build.sh @@ -20,3 +20,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/* From 2f9347e3abdf1861463cff32da604c372fce409d Mon Sep 17 00:00:00 2001 From: Anthony Bretaudeau Date: Wed, 8 Aug 2018 09:40:09 +0200 Subject: [PATCH 07/11] rebuild on macos --- recipes/perl-json-xs/meta.yaml | 2 +- recipes/perl-xml-filter-buffertext/meta.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/perl-json-xs/meta.yaml b/recipes/perl-json-xs/meta.yaml index 6b59b555ac84e..1044be3f84b62 100644 --- a/recipes/perl-json-xs/meta.yaml +++ b/recipes/perl-json-xs/meta.yaml @@ -11,7 +11,7 @@ source: sha256: {{ sha256 }} build: - number: 1 + number: 2 requirements: build: diff --git a/recipes/perl-xml-filter-buffertext/meta.yaml b/recipes/perl-xml-filter-buffertext/meta.yaml index 0be0981556873..1193186f1f607 100644 --- a/recipes/perl-xml-filter-buffertext/meta.yaml +++ b/recipes/perl-xml-filter-buffertext/meta.yaml @@ -7,7 +7,7 @@ source: md5: 2992c0387632583b966ab9c965b25512 build: - number: 1 + number: 2 requirements: host: From bab0871b36001dad0e0429fe35d020be1cefa124 Mon Sep 17 00:00:00 2001 From: Anthony Bretaudeau Date: Wed, 8 Aug 2018 10:55:30 +0200 Subject: [PATCH 08/11] no need to rebuild this version (see #10313) --- recipes/perl-json-xs/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/perl-json-xs/meta.yaml b/recipes/perl-json-xs/meta.yaml index 1044be3f84b62..42826267b4b98 100644 --- a/recipes/perl-json-xs/meta.yaml +++ b/recipes/perl-json-xs/meta.yaml @@ -11,7 +11,7 @@ source: sha256: {{ sha256 }} build: - number: 2 + number: 0 requirements: build: From 130cfc9eb4d5c5d897b60bb7349810ffb427fa35 Mon Sep 17 00:00:00 2001 From: Anthony Bretaudeau Date: Wed, 8 Aug 2018 11:34:08 +0200 Subject: [PATCH 09/11] mac perms --- recipes/perl-data-stag/build.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes/perl-data-stag/build.sh b/recipes/perl-data-stag/build.sh index 64652ea2132d9..823aaaf89cbef 100644 --- a/recipes/perl-data-stag/build.sh +++ b/recipes/perl-data-stag/build.sh @@ -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/* From 942a93a9fa817ac435ffa1ca69e4a9e790dbf4ac Mon Sep 17 00:00:00 2001 From: Anthony Bretaudeau Date: Wed, 8 Aug 2018 11:35:07 +0200 Subject: [PATCH 10/11] rebuild --- recipes/perl-json/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/perl-json/meta.yaml b/recipes/perl-json/meta.yaml index 216d8e7e7e6aa..6ce037148bd06 100644 --- a/recipes/perl-json/meta.yaml +++ b/recipes/perl-json/meta.yaml @@ -7,7 +7,7 @@ source: md5: e1512169a623e790a3f69b599cc1d3b9 build: - number: 2 + number: 3 requirements: host: From 4936363850b1502607d84d6137c0096bfd7c2466 Mon Sep 17 00:00:00 2001 From: Anthony Bretaudeau Date: Wed, 8 Aug 2018 12:09:51 +0200 Subject: [PATCH 11/11] rebuild --- recipes/perl-svg/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/perl-svg/meta.yaml b/recipes/perl-svg/meta.yaml index 8a984fbc67da3..84df567ffb4cd 100644 --- a/recipes/perl-svg/meta.yaml +++ b/recipes/perl-svg/meta.yaml @@ -7,7 +7,7 @@ source: md5: ba4445ee72e2f3c29da332cb0119a2ad build: - number: 1 + number: 2 requirements: host: