add logic to detect one version of lapack at one location, and nclude…

… it in the build. No calls to it yet
Whiteknight · Aug 22, 2010 · c20761a · c20761a
1 parent 4e23a2f
commit c20761a
Showing 1 changed file with 29 additions and 4 deletions.
diff --git a/setup.nqp b/setup.nqp
@@ -29,7 +29,8 @@ sub MAIN(@argv) {
     }
     if $mode eq "build" {
         probe_for_cblas(%PLA);
-        system_linker_settings(%PLA);
+        find_blas(%PLA);
+        find_lapack(%PLA);
     }
     if $mode eq "test" {
         run_test_harness(%PLA);
@@ -56,13 +57,12 @@ sub probe_for_cblas(%PLA) {
     }
 }
 
-sub system_linker_settings(%PLA) {
-    %PLA{'dynpmc_cflags'} := '-g -Isrc/include/';
+sub find_blas(%PLA) {
     my %config := get_config();
     my $osname := %config{'osname'};
     if $osname eq 'linux' {
         my %searches;
-        %searches{'/usr/lib/libblas.so'} := '-lblas';
+        %searches{'/usr/lib/libblas.so'} := ' -lblas';
         %searches{'/usr/lib/atlas/libcblas.so'} := '-L/usr/lib/atlas -lcblas';
         for %searches {
             my $searchloc := $_;
@@ -82,6 +82,30 @@ sub system_linker_settings(%PLA) {
     }
 }
 
+sub find_lapack(%PLA) {
+    my %config := get_config();
+    my $osname := %config{'osname'};
+    if $osname eq 'linux' {
+        my %searches;
+        %searches{'/usr/lib/liblapack-3.so'} := ' -llapack-3';
+        for %searches {
+            my $searchloc := $_;
+            my $test_ldd := pir::spawnw__IS('ldd ' ~ $searchloc);
+            if $test_ldd == 0 {
+                my $flags := %PLA{'dynpmc_ldflags'};
+                my $libflags := %searches{$searchloc};
+                $flags := ~$flags ~ $libflags;
+                %PLA{'dynpmc_ldflags'} := $flags;
+                return;
+            }
+        }
+    }
+    else {
+        pir::say("Only Linux is currently supported");
+        pir::exit(1);
+    }
+}
+
 sub run_test_harness(%PLA) {
     my $nqp := get_nqp();
     my $result := pir::spawnw__IS($nqp ~ " t/harness");
@@ -142,6 +166,7 @@ sub clean_c_library_files(*%kv) {
 }
 
 sub setup_dynpmc(%PLA) {
+    %PLA{'dynpmc_cflags'} := '-g -Isrc/include/';
     %PLA{'dynpmc'}{'linalg_group'} := <
         src/pmc/nummatrix2d.pmc
         src/pmc/pmcmatrix2d.pmc