Merge branch 'master' of git://factorcode.org/git/factor

diff --git a/Makefile b/Makefile
index 0c426ca5bc9e61c564272a34b93bdc0358c0b92b..bfaaa3eee44f54f86d875663297aac4750db92ed 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -160,7 +160,7 @@ factor-console: $(DLL_OBJS) $(EXE_OBJS)
                $(CFLAGS) $(CFLAGS_CONSOLE) -o factor$(EXE_SUFFIX)$(CONSOLE_EXTENSION) $(EXE_OBJS)
 
 factor-ffi-test: $(TEST_OBJS)
-       $(CC) $(LIBPATH) $(CFLAGS) $(SHARED_FLAG) -o libfactor-ffi-test$(DLL_EXTENSION) $(TEST_OBJS)
+       $(CC) $(LIBPATH) $(CFLAGS) $(FFI_TEST_CFLAGS) $(SHARED_FLAG) -o libfactor-ffi-test$(DLL_EXTENSION) $(TEST_OBJS)
 
 clean:
        rm -f vm/*.o

diff --git a/basis/alien/fortran/fortran.factor b/basis/alien/fortran/fortran.factor
index 83d56bf9e266b73cd90e400d1df9eb7b4159e933..71efa1aa24760b77a63bf8165ee44d12daf47b8f 100644 (file)
--- a/basis/alien/fortran/fortran.factor
+++ b/basis/alien/fortran/fortran.factor
@@ -5,7 +5,7 @@ byte-arrays combinators combinators.short-circuit fry generalizations
 kernel lexer macros math math.parser namespaces parser sequences
 splitting stack-checker vectors vocabs.parser words locals
 io.encodings.ascii io.encodings.string shuffle effects math.ranges
-math.order sorting strings system ;
+math.order sorting strings system alien.libraries ;
 IN: alien.fortran
 
 SINGLETONS: f2c-abi gfortran-abi intel-unix-abi intel-windows-abi ;

diff --git a/basis/compiler/tests/alien.factor b/basis/compiler/tests/alien.factor
index 2aed251676f12ebbf6ac65efea2b8279c720f949..aa9346f78812b975438ed0e8e6468741f3595839 100644 (file)
--- a/basis/compiler/tests/alien.factor
+++ b/basis/compiler/tests/alien.factor
@@ -4,7 +4,7 @@ namespaces namespaces tools.test sequences stack-checker
 stack-checker.errors words arrays parser quotations
 continuations effects namespaces.private io io.streams.string
 memory system threads tools.test math accessors combinators
-specialized-arrays.float ;
+specialized-arrays.float alien.libraries ;
 
 <<
 : libfactor-ffi-tests-path ( -- string )

diff --git a/basis/math/blas/ffi/ffi.factor b/basis/math/blas/ffi/ffi.factor
index 1749103ce41a47b8c5e70e1e77ac9726ca4cebae..5466ad2161bcfa6fb2821810a691674d64a060aa 100644 (file)
--- a/basis/math/blas/ffi/ffi.factor
+++ b/basis/math/blas/ffi/ffi.factor
@@ -1,4 +1,5 @@
-USING: alien alien.fortran kernel system combinators ;
+USING: alien alien.fortran kernel system combinators
+alien.libraries ;
 IN: math.blas.ffi
 
 <<

diff --git a/basis/pango/cairo/cairo.factor b/basis/pango/cairo/cairo.factor
index 7683b788900748fda40c732349e8ea8c630733ec..45b7a9cb319c72e4507284ed3cb34f45c2c6614e 100644 (file)
--- a/basis/pango/cairo/cairo.factor
+++ b/basis/pango/cairo/cairo.factor
@@ -3,7 +3,8 @@
 ! See http://factorcode.org/license.txt for BSD license.
 !
 ! pangocairo bindings, from pango/pangocairo.h
-USING: alien alien.syntax combinators system cairo.ffi ;
+USING: alien alien.syntax combinators system cairo.ffi
+alien.libraries ;
 IN: pango.cairo
 
 << {
@@ -85,4 +86,4 @@ FUNCTION: void
 pango_cairo_layout_path ( cairo_t* cr, PangoLayout* layout ) ;
 
 FUNCTION: void
-pango_cairo_error_underline_path ( cairo_t* cr, double x, double y, double width, double height ) ;
\ No newline at end of file
+pango_cairo_error_underline_path ( cairo_t* cr, double x, double y, double width, double height ) ;

diff --git a/core/alien/alien-docs.factor b/core/alien/alien-docs.factor
index 398d04e4dd2b65182a863f87ca80d39127b013d5..6bd1d2f53a429f23a034eccfa356d19a2f27e55f 100644 (file)
--- a/core/alien/alien-docs.factor
+++ b/core/alien/alien-docs.factor
@@ -266,7 +266,6 @@ $nl
 { $warning "C does not perform runtime type checking, automatic memory management or array bounds checks. Incorrect usage of C library functions can lead to crashes, data corruption, and security exploits." }
 { $subsection "loading-libs" }
 { $subsection "aliens" }
-{ $subsection "alien.libraries" }
 { $subsection "alien-invoke" }
 { $subsection "alien-callback" }
 { $subsection "c-data" }

diff --git a/vm/Config.linux.x86.64 b/vm/Config.linux.x86.64
index bfd12224965ee9697827556cc0a4f6b6a63cb930..a02fcb4d6d4055679b5b12f2a5bce9779dda76ff 100644 (file)
--- a/vm/Config.linux.x86.64
+++ b/vm/Config.linux.x86.64
@@ -1,3 +1,4 @@
 include vm/Config.linux
 include vm/Config.x86.64
 LIBPATH = -L/usr/X11R6/lib64 -L/usr/X11R6/lib
+FFI_TEST_CFLAGS = -fPIC