From 51e82806d6fb59b805c1dc96d76b14d48c86ff6f Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Sat, 21 Mar 2009 12:27:53 -0500 Subject: [PATCH 1/3] correct name for libpango in factor.sh --- build-support/factor.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-support/factor.sh b/build-support/factor.sh index c5be9f8957..61450dacb4 100755 --- a/build-support/factor.sh +++ b/build-support/factor.sh @@ -142,7 +142,7 @@ check_X11_libraries() { check_library_exists GLU check_library_exists GL check_library_exists X11 - check_library_exists pango + check_library_exists pango-1.0 } check_libraries() { From 92bd390c9b9187fdb7cb697163b7f882125b3fe9 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Fri, 27 Mar 2009 21:57:10 -0500 Subject: [PATCH 2/3] use a different abi on linux for fortran --- basis/math/blas/ffi/ffi.factor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/basis/math/blas/ffi/ffi.factor b/basis/math/blas/ffi/ffi.factor index 5466ad2161..48d43849c7 100644 --- a/basis/math/blas/ffi/ffi.factor +++ b/basis/math/blas/ffi/ffi.factor @@ -7,7 +7,7 @@ IN: math.blas.ffi { [ os macosx? ] [ "libblas.dylib" intel-unix-abi add-fortran-library ] } { [ os windows? cpu x86.32? and ] [ "blas.dll" f2c-abi add-fortran-library ] } { [ os windows? cpu x86.64? and ] [ "blas.dll" gfortran-abi add-fortran-library ] } - { [ os freebsd? ] [ "libblas.so" gfortran-abi add-fortran-library ] } + { [ os [ freebsd? ] [ linux? ] bi or ] [ "libblas.so" gfortran-abi add-fortran-library ] } [ "libblas.so" f2c-abi add-fortran-library ] } cond >> From 40631ec2a90d3525b36f9cb7ee55bbd38d06eb8c Mon Sep 17 00:00:00 2001 From: "U-SLAVA-DFB8FF805\\Slava" Date: Sat, 28 Mar 2009 02:37:07 -0500 Subject: [PATCH 3/3] Fix alien tests on Windows; LoadLibraryEx does not like UNC paths --- basis/compiler/tests/alien.factor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 basis/compiler/tests/alien.factor diff --git a/basis/compiler/tests/alien.factor b/basis/compiler/tests/alien.factor old mode 100644 new mode 100755 index 6802b43de6..5b3bed6554 --- a/basis/compiler/tests/alien.factor +++ b/basis/compiler/tests/alien.factor @@ -9,7 +9,7 @@ IN: compiler.tests << : libfactor-ffi-tests-path ( -- string ) - "resource:" normalize-path + "resource:" (normalize-path) { { [ os winnt? ] [ "libfactor-ffi-test.dll" ] } { [ os macosx? ] [ "libfactor-ffi-test.dylib" ] }