From a60e11b89e328b57b5121f6cc0fd6c0a9a9ae9c8 Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Fri, 30 Jan 2009 16:45:30 -0600
Subject: [PATCH] add RTLD_GLOBAL to dlopen flags. load atlas before cblas on
 freebsd

---
 basis/math/blas/cblas/cblas.factor | 12 +++++++++---
 vm/os-unix.c                       |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/basis/math/blas/cblas/cblas.factor b/basis/math/blas/cblas/cblas.factor
index 4c0a88f929..3914c5b2ec 100644
--- a/basis/math/blas/cblas/cblas.factor
+++ b/basis/math/blas/cblas/cblas.factor
@@ -1,13 +1,19 @@
 USING: alien alien.c-types alien.syntax kernel system combinators ;
 IN: math.blas.cblas
 
-<< "cblas" {
+<<
+: load-atlas ( -- )
+    "atlas" "libatlas.so" "cdecl" add-library
+    "atlas" load-library drop ;
+
+"cblas" {
     { [ os macosx? ] [ "libblas.dylib" "cdecl" add-library ] }
     { [ os windows? ] [ "blas.dll" "cdecl" add-library ] }
     { [ os openbsd? ] [ "libcblas.so" "cdecl" add-library ] }
-    { [ os freebsd? ] [ "libcblas.so" "cdecl" add-library ] }
+    { [ os freebsd? ] [ "libcblas.so" "cdecl" add-library load-atlas ] }
     [ "libblas.so" "cdecl" add-library ]
-} cond >>
+} cond
+>>
 
 LIBRARY: cblas
 
diff --git a/vm/os-unix.c b/vm/os-unix.c
index 97c29d8c6e..b49f7637af 100755
--- a/vm/os-unix.c
+++ b/vm/os-unix.c
@@ -36,7 +36,7 @@ void init_ffi(void)
 
 void ffi_dlopen(F_DLL *dll)
 {
-	dll->dll = dlopen(alien_offset(dll->path), RTLD_LAZY);
+	dll->dll = dlopen(alien_offset(dll->path), RTLD_LAZY|RTLD_GLOBAL);
 }
 
 void *ffi_dlsym(F_DLL *dll, F_SYMBOL *symbol)