Linux: fix the build with static FLIBS libs. 29/19729/2
Clément DAVID [Wed, 7 Feb 2018 17:17:42 +0000 (18:17 +0100)]
output_stream uses Fortran code thus depends on FLIBS and is statically
linked. This change enforces the libtool link_all_deplibs=yes behavior by
set the libscilab.so fat libraries to be linked against FLIBS.

graphics_objects also depends on output_stream but as this dependency
will be resolved by ld.so (scilab-bin then libscilab.so) there
is no need to enforce it.

Change-Id: I836d361046d567d9cc25fbba26ad37de52d6e355

scilab/modules/Makefile.am
scilab/modules/Makefile.in
scilab/modules/graphic_objects/Makefile.am
scilab/modules/graphic_objects/Makefile.in

index bd9f064..fc00b72 100644 (file)
@@ -252,7 +252,7 @@ if FORCE_LINK
 libscilab_la_LIBADD += $(ENGINE_LIBS_DYNAMIC_LOAD)
 endif
 
-libscilab_la_LIBADD += $(LAPACK_LIBS) $(BLAS_LIBS)
+libscilab_la_LIBADD += $(FLIBS) $(LAPACK_LIBS) $(BLAS_LIBS)
 
 ################## libscilab-cli  ##################
 
@@ -261,6 +261,6 @@ libscilab_cli_la_SOURCES =
 libscilab_cli_la_LDFLAGS = $(AM_LDFLAGS) $(SCI_LDFLAGS)
 
 # Core modules
-libscilab_cli_la_LIBADD = $(ENGINE_LIBS) $(NO_GUI_LIBS) $(OTHER_LIBS) $(EXTERNAL_LIBS) $(LAPACK_LIBS) $(BLAS_LIBS)
+libscilab_cli_la_LIBADD = $(ENGINE_LIBS) $(NO_GUI_LIBS) $(OTHER_LIBS) $(EXTERNAL_LIBS) $(FLIBS) $(LAPACK_LIBS) $(BLAS_LIBS)
 
 .NOTPARALLEL: libscilab-cli.la libscilab.la
index 1872ab3..b431774 100644 (file)
@@ -722,14 +722,14 @@ ENGINE_LIBS_DYNAMIC_LOAD = \
 # Core modules
 libscilab_la_LIBADD = $(am__append_7) $(am__append_8) \
        $(top_builddir)/modules/libscilab-cli.la $(OTHER_LIBS) \
-       $(EXTERNAL_LIBS) $(am__append_9) $(LAPACK_LIBS) $(BLAS_LIBS)
+       $(EXTERNAL_LIBS) $(am__append_9) $(FLIBS) $(LAPACK_LIBS) $(BLAS_LIBS)
 
 ################## libscilab-cli  ##################
 libscilab_cli_la_SOURCES = 
 libscilab_cli_la_LDFLAGS = $(AM_LDFLAGS) $(SCI_LDFLAGS)
 
 # Core modules
-libscilab_cli_la_LIBADD = $(ENGINE_LIBS) $(NO_GUI_LIBS) $(OTHER_LIBS) $(EXTERNAL_LIBS) $(LAPACK_LIBS) $(BLAS_LIBS)
+libscilab_cli_la_LIBADD = $(ENGINE_LIBS) $(NO_GUI_LIBS) $(OTHER_LIBS) $(EXTERNAL_LIBS) $(FLIBS) $(LAPACK_LIBS) $(BLAS_LIBS)
 all: all-recursive
 
 .SUFFIXES:
index 80b8207..6cbea15 100644 (file)
@@ -164,7 +164,7 @@ if SWIG
 BUILT_SOURCES+=swig
 endif
 
-libscigraphic_objects_la_LIBADD = $(top_builddir)/modules/output_stream/libscioutput_stream.la $(X_LIBS) $(X_EXTRA_LIBS)
+libscigraphic_objects_la_LIBADD = $(X_LIBS) $(X_EXTRA_LIBS)
 
 
 #### graphic_objects : gateway declaration ####
index d82db5d..f73453b 100644 (file)
@@ -189,7 +189,6 @@ am__v_lt_0 = --silent
 am__v_lt_1 = 
 am__DEPENDENCIES_1 =
 libscigraphic_objects_la_DEPENDENCIES =  \
-       $(top_builddir)/modules/output_stream/libscioutput_stream.la \
        $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am__objects_2 = src/jni/libscigraphic_objects_la-DataLoader_wrap.lo \
        src/jni/libscigraphic_objects_la-ScilabNativeView_wrap.lo \
@@ -831,7 +830,7 @@ SWIG_WRAPPERS = \
     src/jni/graphic_objects.i \
     src/jni/ObjectData.i
 
-libscigraphic_objects_la_LIBADD = $(top_builddir)/modules/output_stream/libscioutput_stream.la $(X_LIBS) $(X_EXTRA_LIBS)
+libscigraphic_objects_la_LIBADD = $(X_LIBS) $(X_EXTRA_LIBS)
 
 #### graphic_objects : gateway declaration ####
 libscigraphic_objects_la_sci_gatewaydir = $(mydatadir)/sci_gateway