Package: sra-sdk / 2.10.9+dfsg-2

find_ngs-sdk.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
Author: Andreas Tille <tille@debian.org>
Last-Update: Mon, 06 Jun 2016 11:24:46 +0200
Description: ngs-sdk header files are in /usr/include

--- a/setup/konfigure.perl
+++ b/setup/konfigure.perl
@@ -493,6 +493,7 @@ if ( $PKG{OPT} ) {
     }
 }
 
+$OPT{'debug'} = 1;
 my %DEPEND_OPTIONS;
 foreach my $href (DEPENDS()) {
     $_ = $href->{name};
@@ -1001,7 +1002,7 @@ EndText
 
     if ($PKG{LNG} eq 'JAVA') {
         L($F,
-            "INCPATHS = \$(SRCDIR):\$(SRCDIR)/itf:\$(TOP)/gov/nih/nlm/ncbi/ngs")
+            "INCPATHS = \$(SRCDIR):/usr/include/ngs/itf:/usr/include/ngs")
     }
 
     print $F <<EndText;
@@ -1379,7 +1380,9 @@ sub find_in_dir {
         print "\tlibraries... " unless ($AUTORUN);
         if ($lib) {
             my $builddir = File::Spec->catdir($dir, $OS, $TOOLS, $ARCH, $BUILD);
-            my $libdir  = File::Spec->catdir($builddir, 'lib');
+            my $buildarch = `dpkg-architecture -qDEB_BUILD_MULTIARCH`;
+            chomp $buildarch;
+            my $libdir  = File::Spec->catdir($dir, 'lib', $buildarch);
             my $ilibdir = File::Spec->catdir($builddir, 'ilib');
             my $f = File::Spec->catdir($libdir, $lib);
             print "\n\t\tchecking $f\n\t" if ($OPT{'debug'});
--- a/setup/package.prl
+++ b/setup/package.prl
@@ -8,7 +8,7 @@ sub PKG { my @OPT = qw ( qmake );
           ( LNG   => 'C',
             OUT   => 'ncbi-outdir',
             LOCOUT=> '../../OUTDIR',
-            PATH  => '/usr/local/ncbi/sra-tools',
+            PATH  => '/usr/lib/ncbi/sra-tools',
             UPATH =>      '$HOME/ncbi/sra-tools',
             OPT   => \@OPT,
          ) }
@@ -22,7 +22,7 @@ sub REQ { (
               option  => 'with-ngs-sdk-prefix',
               origin  => 'I',
               type    => 'L',
-              srcpath => '../ngs/ngs-sdk',
+              srcpath => '/usr/include',
               pkgpath => '/usr/local/ngs/ngs-sdk',
               usrpath =>      '$HOME/ngs/ngs-sdk',
               bldpath => '$HOME/ncbi-outdir/ngs-sdk',