diff options
author | Marek Szuba <marecki@gentoo.org> | 2018-05-01 14:48:24 +0100 |
---|---|---|
committer | Marek Szuba <marecki@gentoo.org> | 2018-05-01 16:13:53 +0100 |
commit | 0243d563e8de7d1eb26227665892172dbf3379f6 (patch) | |
tree | ec7c326a98a55f07357acf3fb573bbdc77b07c6c /dev-perl/Bio-DB-HTS/files | |
parent | net-nntp/tin: Drops old versions (diff) | |
download | gentoo-0243d563e8de7d1eb26227665892172dbf3379f6.tar.gz gentoo-0243d563e8de7d1eb26227665892172dbf3379f6.tar.bz2 gentoo-0243d563e8de7d1eb26227665892172dbf3379f6.zip |
dev-perl/Bio-DB-HTS: remove old
Package-Manager: Portage-2.3.24, Repoman-2.3.6
Diffstat (limited to 'dev-perl/Bio-DB-HTS/files')
-rw-r--r-- | dev-perl/Bio-DB-HTS/files/2.10-build_search_for_so.patch | 29 | ||||
-rw-r--r-- | dev-perl/Bio-DB-HTS/files/2.10-build_split_htslib_opts.patch | 48 |
2 files changed, 0 insertions, 77 deletions
diff --git a/dev-perl/Bio-DB-HTS/files/2.10-build_search_for_so.patch b/dev-perl/Bio-DB-HTS/files/2.10-build_search_for_so.patch deleted file mode 100644 index b3d11bbbe7aa..000000000000 --- a/dev-perl/Bio-DB-HTS/files/2.10-build_search_for_so.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/Build.PL -+++ b/Build.PL -@@ -125,7 +125,7 @@ - - my $hts_lib = "$root"; - my $hts_include = "$root/htslib"; -- if (-f "$hts_lib/libhts.a" && -f "$hts_include/hts.h") { -+ if ((-f "$hts_lib/libhts.so" || -f "$hts_lib/libhts.a") && -f "$hts_include/hts.h") { - $self->config_data('hts_lib' => $hts_lib); - $self->config_data('hts_include' => $hts_include); - return 1; -@@ -145,7 +145,7 @@ - - my $hts_lib = "$root/lib"; - my $hts_include = "$root/include/htslib"; -- if (-f "$hts_lib/libhts.a" && -f "$hts_include/hts.h") { -+ if ((-f "$hts_lib/libhts.so" || -f "$hts_lib/libhts.a") && -f "$hts_include/hts.h") { - $self->config_data('hts_lib' => $hts_lib); - $self->config_data('hts_include' => $hts_include); - return 1; -@@ -164,7 +164,7 @@ - This module requires htslib (http://htslib/org) - Install it if you have not done so already. - --This script will attempt to locate htslib by looking for hts.h and libhts.a in: -+This script will attempt to locate htslib by looking for hts.h and libhts.so/libhts.a in: - - 1. --htslib command line argument - 2. HTSLIB_DIR environment variable diff --git a/dev-perl/Bio-DB-HTS/files/2.10-build_split_htslib_opts.patch b/dev-perl/Bio-DB-HTS/files/2.10-build_split_htslib_opts.patch deleted file mode 100644 index d68bc54e40d9..000000000000 --- a/dev-perl/Bio-DB-HTS/files/2.10-build_split_htslib_opts.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- a/Build.PL -+++ b/Build.PL -@@ -68,7 +68,13 @@ - # If either of these are set, we expect to find the htslib files there: - # (They're explicitly set by the user, so we shouldn't fall back to - # finding another copy somewhere else.) -- if (my $dir = $self->args('htslib')) { -+ if (my ($incdir, $libdir) = ($self->args('htslib-includedir'), $self->args('htslib-libdir'))) { -+ return 1 if $self->find_hts_in_split_install_dirs($incdir, $libdir); -+ $self->die_hts_not_found( -+ "--htslib-includedir '$incdir' or --htslib-libdir '$libdir' command line parameters do not contain expected files\n" -+ ); -+ } -+ elsif (my $dir = $self->args('htslib')) { - return 1 if $self->find_hts_in_build_dir($dir); - return 1 if $self->find_hts_in_install_dir($dir); - $self->die_hts_not_found( -@@ -155,6 +161,22 @@ - } - } - -+sub find_hts_in_split_install_dirs { -+ my ($self, $hts_include, $hts_lib) = @_; -+ -+ chomp($hts_include); -+ chomp($hts_lib); -+ -+ if ((-f "$hts_lib/libhts.so" || -f "$hts_lib/libhts.a") && -f "$hts_include/hts.h") { -+ $self->config_data('hts_lib' => $hts_lib); -+ $self->config_data('hts_include' => $hts_include); -+ return 1; -+ } -+ else { -+ return 0; -+ } -+} -+ - sub die_hts_not_found { - my ($self, $msg) = @_; - -@@ -166,6 +188,7 @@ - - This script will attempt to locate htslib by looking for hts.h and libhts.so/libhts.a in: - -+ 0. --htslib-includedir and --htslib-libdir command line arguments - 1. --htslib command line argument - 2. HTSLIB_DIR environment variable - 3. --prefix command line argument (which also sets installation location) |