r46619 - in /packages/scilab/branches/5.5/debian: changelog control patches/add-lib-dependencies.diff patches/disable-no-as-needed.diff patches/fix-binary-linking.diff patches/fix-lib-linking.diff patches/series rules
sylvestre at users.alioth.debian.org
sylvestre at users.alioth.debian.org
Sun Apr 6 13:26:09 UTC 2014
Author: sylvestre
Date: Sun Apr 6 13:26:09 2014
New Revision: 46619
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46619
Log:
* New snapshot release
* Update the version name
* Build using dh-autoreconf
* Fix linking of the scilab-bin and scilab-cli-bin binaries, don't misuse
LDFLAGS macros to add libraries.
* Fix linking of modules and shared libraries, don't misuse LDFLAGS to
add libraries.
* Fix java cpu directory for arm64 and ppc64el.
Added:
packages/scilab/branches/5.5/debian/patches/add-lib-dependencies.diff
packages/scilab/branches/5.5/debian/patches/disable-no-as-needed.diff
packages/scilab/branches/5.5/debian/patches/fix-binary-linking.diff
packages/scilab/branches/5.5/debian/patches/fix-lib-linking.diff
Modified:
packages/scilab/branches/5.5/debian/changelog
packages/scilab/branches/5.5/debian/control
packages/scilab/branches/5.5/debian/patches/series
packages/scilab/branches/5.5/debian/rules
Modified: packages/scilab/branches/5.5/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.5/debian/changelog?rev=46619&op=diff
==============================================================================
--- packages/scilab/branches/5.5/debian/changelog (original)
+++ packages/scilab/branches/5.5/debian/changelog Sun Apr 6 13:26:09 2014
@@ -1,3 +1,18 @@
+scilab (5.5.0~beta-1+git~20140327-1135-1) unstable; urgency=medium
+
+ * New snapshot release
+ * Update the version name
+
+ [ Matthias Klose ]
+ * Build using dh-autoreconf
+ * Fix linking of the scilab-bin and scilab-cli-bin binaries, don't misuse
+ LDFLAGS macros to add libraries.
+ * Fix linking of modules and shared libraries, don't misuse LDFLAGS to
+ add libraries.
+ * Fix java cpu directory for arm64 and ppc64el.
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Thu, 27 Mar 2014 09:56:05 +0100
+
scilab (5.5.0~beta-1~git~20140324-1354-1) unstable; urgency=medium
* New snapshot release (stable should be released next week)
Modified: packages/scilab/branches/5.5/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.5/debian/control?rev=46619&op=diff
==============================================================================
--- packages/scilab/branches/5.5/debian/control (original)
+++ packages/scilab/branches/5.5/debian/control Sun Apr 6 13:26:09 2014
@@ -4,6 +4,7 @@
Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
Uploaders: Sylvestre Ledru <sylvestre at debian.org>
Build-Depends: autoconf, automake, cdbs, debhelper (>= 7), gfortran,
+ dh-autoreconf,
default-jdk, chrpath, ocaml-nox (>= 3.11.2-3), fakeroot,
tcl8.5-dev, tk8.5-dev, libxml2-dev, libpcre3-dev, libcurl4-openssl-dev,
gettext, libreadline-dev, pkg-config, procps, dpkg-dev (>= 1.16.0),
@@ -14,6 +15,8 @@
libflexdock-java (>= 1.2.3), libjogl2-java (>= 2.0-rc8), libgl1-mesa-dev,
libjrosetta-java (>= 1.0.1), ant, libjgoodies-looks-java,
libskinlf-java,
+# graphic
+ libfreehep-graphics2d-java, libfreehep-graphicsio-emf-java,
# Documentation
libjeuclid-core-java (>= 3.1.3), libbatik-java (>= 1.7), fop (>= 0.95),
javahelp2, libsaxon-java, libavalon-framework-java, docbook-xsl,
@@ -157,7 +160,8 @@
libjeuclid-core-java, libbatik-java (>= 1.7), default-jre, bwidget,
fop (>= 0.95), libsaxon-java, libavalon-framework-java, docbook-xsl,
javahelp2, libjgraphx-java (>= 1.8.0.0), libjgoodies-looks-java,
- libskinlf-java, ${misc:Depends}, libecj-java
+ libskinlf-java, ${misc:Depends}, libecj-java, libfreehep-graphics2d-java,
+ libfreehep-graphicsio-emf-java
Replaces: scilab (<< 5.0), scilab-bin, scilab-minimal-bin (<< 5.4.1-3), libscilab2-java (<< 5.4.1-4)
Breaks: scilab-minimal-bin (<< 5.4.1-3), libscilab2-java (<< 5.4.1-4)
Description: Scientific software package for numerical computations (all binary files)
Added: packages/scilab/branches/5.5/debian/patches/add-lib-dependencies.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.5/debian/patches/add-lib-dependencies.diff?rev=46619&op=file
==============================================================================
--- packages/scilab/branches/5.5/debian/patches/add-lib-dependencies.diff (added)
+++ packages/scilab/branches/5.5/debian/patches/add-lib-dependencies.diff Sun Apr 6 13:26:09 2014
@@ -0,0 +1,42 @@
+Index: b/modules/xcos/Makefile.am
+===================================================================
+--- a/modules/xcos/Makefile.am
++++ b/modules/xcos/Makefile.am
+@@ -116,7 +116,8 @@
+
+
+
+-libscixcos_la_LIBADD = libscixcos-algo.la
++libscixcos_la_LIBADD = libscixcos-algo.la \
++ $(top_builddir)/modules/commons/libscicommons.la
+
+ #### xcos : gateway declaration ####
+ libscixcos_la_sci_gatewaydir = $(mydatadir)/sci_gateway
+Index: b/modules/helptools/Makefile.am
+===================================================================
+--- a/modules/helptools/Makefile.am
++++ b/modules/helptools/Makefile.am
+@@ -18,7 +18,8 @@
+ GIWS_WRAPPERS = src/jni/BuildDocObject.giws.xml \
+ src/jni/BuildDocObjectv2.giws.xml
+
+-libscihelptools_la_LIBADD = libscihelptools-algo.la
++libscihelptools_la_LIBADD = libscihelptools-algo.la \
++ $(top_builddir)/modules/commons/libscicommons.la
+ libscihelptools_algo_la_SOURCES = $(HELPTOOLS_SOURCES)
+ libscihelptools_algo_la_CPPFLAGS = $(libscihelptools_la_CPPFLAGS)
+ noinst_LTLIBRARIES = libscihelptools-algo.la
+#Index: b/modules/graphic_export/Makefile.am
+#===================================================================
+#--- a/modules/graphic_export/Makefile.am
+#+++ b/modules/graphic_export/Makefile.am
+#@@ -75,7 +75,8 @@
+#
+# ## Libraries necessary
+# ## Change to include other Scilab modules/lib
+#-libscigraphic_export_la_LIBADD = libscigraphic_export-algo.la
+#+libscigraphic_export_la_LIBADD = libscigraphic_export-algo.la \
+#+ $(top_builddir)/modules/gui/libscigui.la
+#
+# GIWS_WRAPPERS= src/jni/FileExporter.giws.xml \
+# src/jni/Driver.giws.xml
Added: packages/scilab/branches/5.5/debian/patches/disable-no-as-needed.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.5/debian/patches/disable-no-as-needed.diff?rev=46619&op=file
==============================================================================
--- packages/scilab/branches/5.5/debian/patches/disable-no-as-needed.diff (added)
+++ packages/scilab/branches/5.5/debian/patches/disable-no-as-needed.diff Sun Apr 6 13:26:09 2014
@@ -0,0 +1,19 @@
+Index: b/configure.ac
+===================================================================
+--- a/configure.ac
++++ b/configure.ac
+@@ -574,14 +574,6 @@
+ fi
+
+ COMPILER_CFLAGS="-fno-stack-protector " # bug 3131
+- # Explictly disable the as needed. It was disable by default but Ubuntu
+- # activated it by default since release 11.04. See bug #8961.
+- # Once all cyclic dependencies have been dropped, this line could be removed.
+- # Check if linker supports --as-needed and --no-as-needed options
+- if $LD --help 2>/dev/null | grep no-as-needed > /dev/null; then
+- LDFLAGS="$LDFLAGS -Wl,--no-as-needed"
+- fi
+-
+
+ case "$host" in
+ x86_64-*-linux-gnu | x86_64-linux-gnu)
Added: packages/scilab/branches/5.5/debian/patches/fix-binary-linking.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.5/debian/patches/fix-binary-linking.diff?rev=46619&op=file
==============================================================================
--- packages/scilab/branches/5.5/debian/patches/fix-binary-linking.diff (added)
+++ packages/scilab/branches/5.5/debian/patches/fix-binary-linking.diff Sun Apr 6 13:26:09 2014
@@ -0,0 +1,85 @@
+Index: b/Makefile.am
+===================================================================
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -38,22 +38,8 @@
+ bin_SCRIPTS += bin/checkmacosx.applescript
+ endif
+
+-scilab_bin_LDFLAGS = $(AM_LDFLAGS) $(OPENMPI_LIBS) $(XML_LIBS)
+-scilab_cli_bin_LDFLAGS = $(AM_LDFLAGS) $(OPENMPI_LIBS) $(XML_LIBS)
+-
+-if USE_STATIC_SYSTEM_LIB
+-scilab_bin_LDFLAGS += -static-libstdc++ -static-libgcc
+-# -static-libgfortran
+-scilab_cli_bin_LDFLAGS += -static-libstdc++ -static-libgcc
+-#-static-libgfortran
+-else
+-# Clang (for example) needs an explicit reference to the lib
+-scilab_bin_LDFLAGS += -lstdc++
+-# -static-libgfortran
+-scilab_cli_bin_LDFLAGS += -lstdc++
+-#-static-libgfortran
+-endif
+-
++scilab_bin_LDFLAGS = $(AM_LDFLAGS)
++scilab_cli_bin_LDFLAGS = $(AM_LDFLAGS)
+
+ if IS_MACOSX
+ scilab_bin_LDFLAGS += -framework Cocoa
+@@ -69,15 +55,30 @@
+ # (causing issues on some platform)
+ COMMON_LIBS = $(LTLIBINTL)
+
+-scilab_bin_SOURCES = modules/startup/src/c/mainscic.cpp
+-
+-scilab_bin_LDADD = $(COMMON_LIBS) $(top_builddir)/modules/libscilab.la $(FLIBS)
++scilab_bin_SOURCES = modules/startup/src/c/mainscic.cpp
+
+ # Match scilab -nwni (ie command line without graphics)
+ scilab_cli_bin_SOURCES = modules/startup/src/c/mainscic.cpp
+-
+ scilab_cli_bin_CPPFLAGS = -DWITHOUT_GUI $(scilab_bin_CPPFLAGS)
+-scilab_cli_bin_LDADD = $(COMMON_LIBS) $(top_builddir)/modules/libscilab-cli.la $(FLIBS)
++
++
++# the scilab-bin object file itself uses symbols from at least libscilab-cli.la,
++# libsciconsole-minimal.la and libscijvm-disable.la, so we have to link with these
++# libraries explicitly unless we link with -Wl,--copy-dt-needed-entries
++scilab_bin_LDADD = \
++ $(top_builddir)/modules/libscilab.la \
++ $(top_builddir)/modules/libscilab-cli.la \
++ $(top_builddir)/modules/console/libsciconsole-minimal.la \
++ $(top_builddir)/modules/jvm/libscijvm.la \
++ $(OPENMPI_LIBS) $(XML_LIBS) \
++ $(COMMON_LIBS) $(FLIBS)
++
++scilab_cli_bin_LDADD = \
++ $(top_builddir)/modules/libscilab-cli.la \
++ $(top_builddir)/modules/console/libsciconsole-minimal.la \
++ $(top_builddir)/modules/jvm/libscijvm-disable.la \
++ $(OPENMPI_LIBS) $(XML_LIBS) \
++ $(COMMON_LIBS) $(FLIBS)
+
+ if MPI
+ CXX = $(OPENMPI_CXX)
+@@ -94,6 +95,19 @@
+ scilab_bin_LDADD += $(JAVA_JNI_LIBS)
+ endif
+
++if USE_STATIC_SYSTEM_LIB
++scilab_bin_LDFLAGS += -static-libstdc++ -static-libgcc
++# -static-libgfortran
++scilab_cli_bin_LDFLAGS += -static-libstdc++ -static-libgcc
++#-static-libgfortran
++else
++# Clang (for example) needs an explicit reference to the lib
++scilab_bin_LDADD += -lstdc++
++# -static-libgfortran
++scilab_cli_bin_LDADD += -lstdc++
++#-static-libgfortran
++endif
++
+ if IS_SOLARIS
+ # The binary itself needs this dep
+ scilab_bin_LDADD += $(BLAS_LIBS)
Added: packages/scilab/branches/5.5/debian/patches/fix-lib-linking.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.5/debian/patches/fix-lib-linking.diff?rev=46619&op=file
==============================================================================
--- packages/scilab/branches/5.5/debian/patches/fix-lib-linking.diff (added)
+++ packages/scilab/branches/5.5/debian/patches/fix-lib-linking.diff Sun Apr 6 13:26:09 2014
@@ -0,0 +1,579 @@
+Index: b/modules/Makefile.am
+===================================================================
+--- a/modules/Makefile.am
++++ b/modules/Makefile.am
+@@ -121,7 +121,7 @@
+ pkglib_LTLIBRARIES = libscilab-cli.la libscilab.la
+ libscilab_la_SOURCES =
+
+-libscilab_la_LDFLAGS = $(LAPACK_LIBS) $(BLAS_LIBS) $(AM_LDFLAGS) $(SCI_LDFLAGS)
++libscilab_la_LDFLAGS = $(AM_LDFLAGS) $(SCI_LDFLAGS)
+
+
+ GUI_LIBS = $(top_builddir)/modules/gui/libscigui.la \
+@@ -221,6 +221,8 @@
+ libscilab_la_LIBADD += $(NO_GUI_LIBS)
+ endif
+
++libscilab_la_LIBADD += $(top_builddir)/modules/libscilab-cli.la
++
+ # Core modules
+ libscilab_la_LIBADD += $(OTHER_LIBS) $(EXTERNAL_LIBS)
+
+@@ -232,15 +234,15 @@
+ libscilab_la_LIBADD += $(ENGINE_LIBS_DYNAMIC_LOAD)
+ endif
+
+-libscilab_la_LIBADD += $(top_builddir)/modules/libscilab-cli.la
++libscilab_la_LIBADD += $(LAPACK_LIBS) $(BLAS_LIBS)
+
+ ################## libscilab-cli ##################
+
+ libscilab_cli_la_SOURCES =
+
+-libscilab_cli_la_LDFLAGS = $(LAPACK_LIBS) $(BLAS_LIBS) $(AM_LDFLAGS) $(SCI_LDFLAGS)
++libscilab_cli_la_LDFLAGS = $(AM_LDFLAGS) $(SCI_LDFLAGS)
+
+ # Core modules
+-libscilab_cli_la_LIBADD = $(ENGINE_LIBS) $(NO_GUI_LIBS) $(OTHER_LIBS) $(EXTERNAL_LIBS)
++libscilab_cli_la_LIBADD = $(ENGINE_LIBS) $(NO_GUI_LIBS) $(OTHER_LIBS) $(EXTERNAL_LIBS) $(LAPACK_LIBS) $(BLAS_LIBS)
+
+ .NOTPARALLEL: libscilab-cli.la libscilab.la
+Index: b/modules/arnoldi/Makefile.am
+===================================================================
+--- a/modules/arnoldi/Makefile.am
++++ b/modules/arnoldi/Makefile.am
+@@ -29,7 +29,8 @@
+
+ pkglib_LTLIBRARIES = libsciarnoldi.la
+
+-libsciarnoldi_la_LDFLAGS = $(BLAS_LIBS) $(LAPACK_LIBS) $(ARPACK_LIBS) $(AM_LDFLAGS)
++libsciarnoldi_la_LDFLAGS = $(AM_LDFLAGS)
++libsciarnoldi_la_LIBADD = $(BLAS_LIBS) $(LAPACK_LIBS) $(ARPACK_LIBS)
+
+ libsciarnoldi_la_SOURCES = $(ARNOLDI_C_SOURCES) $(GATEWAY_C_SOURCES)
+
+Index: b/modules/core/Makefile.am
+===================================================================
+--- a/modules/core/Makefile.am
++++ b/modules/core/Makefile.am
+@@ -310,7 +310,7 @@
+ endif
+
+
+-libscicore_la_LDFLAGS = $(XML_LIBS) $(AM_LDFLAGS)
++libscicore_la_LDFLAGS = $(AM_LDFLAGS)
+ #-Wl,--version-script,LibScilab_Import.def
+
+ # For the code check (splint)
+@@ -322,7 +322,7 @@
+ libscicore_algo_la_CPPFLAGS = $(libscicore_la_CPPFLAGS)
+
+ # Commented because it is easier to comment first the core module
+-libscicore_la_LIBADD = libscicore-algo.la
++libscicore_la_LIBADD = libscicore-algo.la $(XML_LIBS)
+
+ #### Target ######
+ modulename=core
+Index: b/modules/external_objects_java/Makefile.am
+===================================================================
+--- a/modules/external_objects_java/Makefile.am
++++ b/modules/external_objects_java/Makefile.am
+@@ -109,14 +109,18 @@
+ pkglib_LTLIBRARIES = libsciexternal_objects_java.la
+ noinst_LTLIBRARIES = libsciexternal_objects_java-algo.la
+
+-libsciexternal_objects_java_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION) $(LD_FLAGS) $(X_LIBS) $(X_EXTRA_LIBS)
++libsciexternal_objects_java_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION) $(LD_FLAGS)
+
+ libsciexternal_objects_java_algo_la_SOURCES = $(EXTERNAL_OBJECTS_JAVA_C_SOURCES) $(EXTERNAL_OBJECTS_JAVA_JNI_SOURCES) $(EXTERNAL_OBJECTS_JAVA_CPP_SOURCES)
+ libsciexternal_objects_java_la_SOURCES = $(GATEWAY_C_SOURCES) $(GATEWAY_CPP_SOURCES)
+ libsciexternal_objects_java_algo_la_CFLAGS = $(libsciexternal_objects_java_la_CFLAGS)
+ libsciexternal_objects_java_algo_la_CPPFLAGS = $(libsciexternal_objects_java_la_CPPFLAGS)
+
+-libsciexternal_objects_java_la_LIBADD = libsciexternal_objects_java-algo.la $(top_builddir)/modules/commons/libscicommons.la $(top_builddir)/modules/jvm/libscijvm.la
++libsciexternal_objects_java_la_LIBADD = \
++ libsciexternal_objects_java-algo.la \
++ $(top_builddir)/modules/commons/libscicommons.la \
++ $(top_builddir)/modules/jvm/libscijvm.la \
++ $(X_LIBS) $(X_EXTRA_LIBS)
+
+ # For the code check (splint)
+ CHECK_SRC= $(EXTERNAL_OBJECTS_JAVA_C_SOURCES) $(GATEWAY_C_SOURCES)
+Index: b/modules/fftw/Makefile.am
+===================================================================
+--- a/modules/fftw/Makefile.am
++++ b/modules/fftw/Makefile.am
+@@ -22,7 +22,7 @@
+ noinst_LTLIBRARIES += libscifftw-algo.la
+ endif
+
+-libscifftw_la_LDFLAGS = $(FFTW3_LIB) $(AM_LDFLAGS)
++libscifftw_la_LDFLAGS = $(AM_LDFLAGS)
+
+ #### fftw : Conf files ####
+ libscifftw_la_rootdir = $(mydatadir)
+@@ -66,7 +66,7 @@
+ CHECK_SRC= $(FFTW_C_SOURCES) $(GATEWAY_C_SOURCES)
+ INCLUDE_FLAGS = $(libscifftw_la_CPPFLAGS)
+
+-libscifftw_la_LIBADD = libscifftw-algo.la
++libscifftw_la_LIBADD = libscifftw-algo.la $(FFTW3_LIB)
+
+ libscifftw_la_CPPFLAGS = -I$(srcdir)/includes/ \
+ -I$(srcdir)/src/c/ \
+Index: b/modules/graphic_objects/Makefile.am
+===================================================================
+--- a/modules/graphic_objects/Makefile.am
++++ b/modules/graphic_objects/Makefile.am
+@@ -115,7 +115,7 @@
+ pkglib_LTLIBRARIES += libscigraphic_objects.la
+ endif
+
+-libscigraphic_objects_la_LDFLAGS = $(X_LIBS) $(X_EXTRA_LIBS) $(AM_LDFLAGS)
++libscigraphic_objects_la_LDFLAGS = $(AM_LDFLAGS)
+
+ libscigraphic_objects_la_SOURCES = $(GRAPHIC_OBJECTS_GEN_SOURCES) $(GRAPHIC_OBJECTS_C_SOURCES) $(GRAPHIC_OBJECTS_JNI_SOURCES) $(GATEWAY_C_SOURCES) $(GATEWAY_CXX_SOURCES) $(GRAPHIC_OBJECTS_CXX_SOURCES)
+
+@@ -136,7 +136,7 @@
+ BUILT_SOURCES+=swig
+ endif
+
+-libscigraphic_objects_la_LIBADD = $(top_builddir)/modules/output_stream/libscioutput_stream.la
++libscigraphic_objects_la_LIBADD = $(top_builddir)/modules/output_stream/libscioutput_stream.la $(X_LIBS) $(X_EXTRA_LIBS)
+
+
+ #### graphic_objects : gateway declaration ####
+Index: b/modules/hdf5/Makefile.am
+===================================================================
+--- a/modules/hdf5/Makefile.am
++++ b/modules/hdf5/Makefile.am
+@@ -115,7 +115,7 @@
+
+ # When Scilab is built with HDF5, we need some libraries for a workaround
+
+-libscihdf5_la_LDFLAGS = $(HDF5_LIBS) $(AM_LDFLAGS) -lhdf5_hl
++libscihdf5_la_LDFLAGS = $(AM_LDFLAGS)
+
+ libscihdf5_algo_la_SOURCES = $(HDF5_SOURCES) $(HDF5_CXX_SOURCES)
+ libscihdf5_la_SOURCES = $(GATEWAY_CXX_SOURCES) $(GATEWAY_C_SOURCES)
+@@ -125,7 +125,7 @@
+ CHECK_SRC= $(HDF5_SOURCES) $(GATEWAY_CXX_SOURCES)
+ INCLUDE_FLAGS = $(libscihdf5_la_CPPFLAGS)
+
+-libscihdf5_la_LIBADD = libscihdf5-algo.la
++libscihdf5_la_LIBADD = libscihdf5-algo.la $(HDF5_LIBS) -lhdf5_hl
+
+ #### Target ######
+ modulename=hdf5
+Index: b/modules/localization/Makefile.am
+===================================================================
+--- a/modules/localization/Makefile.am
++++ b/modules/localization/Makefile.am
+@@ -50,12 +50,6 @@
+ libscilocalization_la_LDFLAGS = $(AM_LDFLAGS)
+ libscilocalization_la_CFLAGS = $(AM_CFLAGS)
+
+-# FIXME: platform dependent things should be in configure.ac
+-if IS_MACOSX
+-libscilocalization_la_LDFLAGS += -lintl -framework Cocoa
+-libscilocalization_la_CFLAGS += -lintl -framework Cocoa
+-endif
+-
+ libscilocalization_algo_la_SOURCES = $(LOCALIZATION_C_SOURCES)
+ libscilocalization_la_SOURCES = $(GATEWAY_C_SOURCES)
+ libscilocalization_algo_la_CPPFLAGS = $(libscilocalization_la_CPPFLAGS)
+@@ -68,6 +62,13 @@
+
+ libscilocalization_la_LIBADD = libscilocalization-algo.la
+
++# FIXME: platform dependent things should be in configure.ac
++if IS_MACOSX
++libscilocalization_la_LDFLAGS += -framework Cocoa
++libscilocalization_la_LIBADD += -lintl
++libscilocalization_la_CFLAGS += -framework Cocoa
++endif
++
+ # $(top_builddir)/modules/io/libsciio.la
+ #### Target ######
+ modulename=localization
+Index: b/modules/matio/Makefile.am
+===================================================================
+--- a/modules/matio/Makefile.am
++++ b/modules/matio/Makefile.am
+@@ -36,7 +36,7 @@
+ src/c/GetStructVariable.c \
+ src/c/GetSparseVariable.c
+
+-libscimatio_la_LDFLAGS = $(MATIO_LIBS) $(AM_LDFLAGS)
++libscimatio_la_LDFLAGS = $(AM_LDFLAGS)
+
+ else
+
+@@ -80,4 +80,4 @@
+ libscimatio_la_sci_gatewaydir = $(mydatadir)/sci_gateway
+ libscimatio_la_sci_gateway_DATA = sci_gateway/matio_gateway.xml
+
+-libscimatio_la_LIBADD = libscimatio-algo.la
++libscimatio_la_LIBADD = libscimatio-algo.la $(MATIO_LIBS)
+Index: b/modules/mpi/Makefile.am
+===================================================================
+--- a/modules/mpi/Makefile.am
++++ b/modules/mpi/Makefile.am
+@@ -35,8 +35,8 @@
+ -I$(top_srcdir)/modules/localization/includes \
+ -I$(top_srcdir)/modules/api_scilab/includes \
+ -DDEBUG
+-libscimpi_la_LDFLAGS = $(OPENMPI_LIBS)
+-# $(LAMPI_LDFLAGS)
++# libscimpi_la_LDFLAGS = $(LAMPI_LDFLAGS)
++libscimpi_la_LIBADD = $(OPENMPI_LIBS)
+
+ # Name of the future library (.la will be replace by .so, .a, etc regarding
+ # the system)
+Index: b/modules/preferences/Makefile.am
+===================================================================
+--- a/modules/preferences/Makefile.am
++++ b/modules/preferences/Makefile.am
+@@ -82,7 +82,7 @@
+ PREFERENCES_CLI_C_SOURCES = src/nopreferences/nopreferences.c
+ libscipreferences_cli_la_SOURCES = $(PREFERENCES_CLI_C_SOURCES)
+
+-libscipreferences_la_LDFLAGS = $(X_LIBS) $(X_EXTRA_LIBS) $(XML_LIBS) $(AM_LDFLAGS)
++libscipreferences_la_LDFLAGS = $(AM_LDFLAGS)
+
+ pkglib_LTLIBRARIES = libscipreferences-cli.la
+
+@@ -114,7 +114,7 @@
+ endif
+
+ libscipreferences_cli_la_LIBADD = libscipreferences-algo.la
+-libscipreferences_la_LIBADD = libscipreferences-algo.la
++libscipreferences_la_LIBADD = libscipreferences-algo.la $(X_LIBS) $(X_EXTRA_LIBS) $(XML_LIBS)
+
+
+ #### preferences : gateway declaration ####
+Index: b/modules/scicos/Makefile.am
+===================================================================
+--- a/modules/scicos/Makefile.am
++++ b/modules/scicos/Makefile.am
+@@ -104,9 +104,9 @@
+ endif
+ endif
+
+-libsciscicos_algo_la_LDFLAGS = $(RT_LIB) $(AM_LDFLAGS)
+-libsciscicos_cli_la_LDFLAGS = $(RT_LIB) $(AM_LDFLAGS)
+-libsciscicos_la_LDFLAGS = $(RT_LIB) $(AM_LDFLAGS)
++libsciscicos_algo_la_LDFLAGS = $(AM_LDFLAGS)
++libsciscicos_cli_la_LDFLAGS = $(AM_LDFLAGS)
++libsciscicos_la_LDFLAGS = $(AM_LDFLAGS)
+
+ if XCOS
+ libsciscicos_algo_la_CPPFLAGS= -I$(srcdir)/includes/ \
+@@ -143,6 +143,7 @@
+ libsciscicos_la_SOURCES =
+ endif
+
++libsciscicos_algo_la_LIBADD =
+ libsciscicos_cli_la_LIBADD = libsciscicos-algo.la
+ libsciscicos_la_LIBADD = libsciscicos-algo.la
+ if XCOS
+@@ -154,6 +155,10 @@
+ endif
+ endif
+
++libsciscicos_algo_la_LIBADD += $(RT_LIB)
++libsciscicos_cli_la_LIBADD += $(RT_LIB)
++libsciscicos_la_LIBADD += $(RT_LIB)
++
+
+ # For the code check (splint)
+ CHECK_SRC= $(SCICOS_C_SOURCES) $(GATEWAY_C_SOURCES)
+Index: b/modules/scicos_blocks/Makefile.am
+===================================================================
+--- a/modules/scicos_blocks/Makefile.am
++++ b/modules/scicos_blocks/Makefile.am
+@@ -416,9 +416,9 @@
+ endif
+ endif
+
+-libsciscicos_blocks_algo_la_LDFLAGS = $(RT_LIB) $(AM_LDFLAGS)
+-libsciscicos_blocks_la_LDFLAGS = $(RT_LIB) $(AM_LDFLAGS)
+-libsciscicos_blocks_cli_la_LDFLAGS = $(RT_LIB) $(AM_LDFLAGS)
++libsciscicos_blocks_algo_la_LDFLAGS = $(AM_LDFLAGS)
++libsciscicos_blocks_la_LDFLAGS = $(AM_LDFLAGS)
++libsciscicos_blocks_cli_la_LDFLAGS = $(AM_LDFLAGS)
+
+ libsciscicos_blocks_algo_la_CPPFLAGS= -I$(srcdir)/includes/ \
+ -I$(srcdir)/src/c/ \
+@@ -451,15 +451,23 @@
+
+ libsciscicos_blocks_cli_la_SOURCES =
+ libsciscicos_blocks_la_SOURCES =
++
++libsciscicos_blocks_algo_la_LIBADD =
++libsciscicos_blocks_la_LIBADD =
++libsciscicos_blocks_cli_la_LIBADD =
++
+ if XCOS
+ libsciscicos_blocks_cli_la_SOURCES += $(NON_BLOCK_CLI_SOURCES)
+-libsciscicos_blocks_cli_la_LIBADD = libsciscicos_blocks-algo.la
++libsciscicos_blocks_cli_la_LIBADD += libsciscicos_blocks-algo.la
+ if GUI
+ libsciscicos_blocks_la_SOURCES += $(NON_BLOCK_JNI_SOURCES)
+-libsciscicos_blocks_la_LIBADD = libsciscicos_blocks-algo.la
++libsciscicos_blocks_la_LIBADD += libsciscicos_blocks-algo.la
+ endif
+ endif
+
++libsciscicos_blocks_algo_la_LIBADD += $(RT_LIB)
++libsciscicos_blocks_la_LIBADD += $(RT_LIB)
++libsciscicos_blocks_cli_la_LIBADD += $(RT_LIB)
+
+ # For the code check (splint)
+ CHECK_SRC= $(SCICOS_BLOCKS_C_SOURCES) $(NON_BLOCK_C_SOURCES)
+Index: b/modules/scinotes/Makefile.am
+===================================================================
+--- a/modules/scinotes/Makefile.am
++++ b/modules/scinotes/Makefile.am
+@@ -72,7 +72,7 @@
+ noinst_LTLIBRARIES = libsciscinotes-algo.la
+ endif
+
+-libsciscinotes_la_LDFLAGS = $(X_LIBS) $(X_EXTRA_LIBS) $(AM_LDFLAGS)
++libsciscinotes_la_LDFLAGS = $(AM_LDFLAGS)
+
+ libsciscinotes_algo_la_SOURCES = $(SCINOTES_C_SOURCES) $(SCINOTES_JNI_SOURCES) $(SCINOTES_CXX_SOURCES)
+ libsciscinotes_la_SOURCES = $(GATEWAY_C_SOURCES) $(GATEWAY_CXX_SOURCES)
+@@ -93,7 +93,7 @@
+ BUILT_SOURCES+=swig
+ endif
+
+-libsciscinotes_la_LIBADD = libsciscinotes-algo.la
++libsciscinotes_la_LIBADD = libsciscinotes-algo.la $(X_LIBS) $(X_EXTRA_LIBS)
+
+ #### scinotes : gateway declaration ####
+ libsciscinotes_la_sci_gatewaydir = $(mydatadir)/sci_gateway
+Index: b/modules/string/Makefile.am
+===================================================================
+--- a/modules/string/Makefile.am
++++ b/modules/string/Makefile.am
+@@ -92,7 +92,7 @@
+ endif
+
+
+-libscistring_la_LDFLAGS = $(PCRE_LIBS) $(AM_LDFLAGS)
++libscistring_la_LDFLAGS = $(AM_LDFLAGS)
+
+ libscistring_algo_la_SOURCES = $(STRING_C_SOURCES) $(STRING_CPP_SOURCES) $(STRING_FORTRAN_SOURCES)
+ libscistring_la_SOURCES = $(GATEWAY_C_SOURCES) $(GATEWAY_FORTRAN_SOURCES)
+@@ -103,7 +103,7 @@
+ INCLUDE_FLAGS = $(libscistring_la_CPPFLAGS)
+
+ # commented since it is the first module to be processed
+-libscistring_la_LIBADD = libscistring-algo.la
++libscistring_la_LIBADD = libscistring-algo.la $(PCRE_LIBS)
+
+ #### Target ######
+ modulename=string
+Index: b/modules/tclsci/Makefile.am
+===================================================================
+--- a/modules/tclsci/Makefile.am
++++ b/modules/tclsci/Makefile.am
+@@ -47,7 +47,7 @@
+ pkglib_LTLIBRARIES = libscitclsci.la
+ noinst_LTLIBRARIES = libscitclsci-algo.la
+
+-libscitclsci_la_LDFLAGS = $(TCLTK_LIBS) $(AM_LDFLAGS)
++libscitclsci_la_LDFLAGS = $(AM_LDFLAGS)
+
+ libscitclsci_la_CPPFLAGS= -I$(srcdir)/includes/ \
+ -I$(srcdir)/src/c \
+@@ -70,7 +70,7 @@
+ CHECK_SRC= $(libscitclsci_la_SOURCES)
+ INCLUDE_FLAGS = $(libscitclsci_la_CPPFLAGS)
+
+-libscitclsci_la_LIBADD = libscitclsci-algo.la
++libscitclsci_la_LIBADD = libscitclsci-algo.la $(TCLTK_LIBS)
+ #### Target ######
+ modulename=tclsci
+
+Index: b/modules/ui_data/Makefile.am
+===================================================================
+--- a/modules/ui_data/Makefile.am
++++ b/modules/ui_data/Makefile.am
+@@ -95,7 +95,7 @@
+ noinst_LTLIBRARIES = libsciui_data-algo.la
+ endif
+
+-libsciui_data_la_LDFLAGS = $(X_LIBS) $(X_EXTRA_LIBS) $(AM_LDFLAGS)
++libsciui_data_la_LDFLAGS = $(AM_LDFLAGS)
+
+ libsciui_data_algo_la_SOURCES = $(UI_DATA_C_SOURCES) $(UI_DATA_JNI_SOURCES) $(UI_DATA_CXX_SOURCES)
+ libsciui_data_la_SOURCES = $(GATEWAY_C_SOURCES) $(GATEWAY_CXX_SOURCES)
+@@ -105,7 +105,7 @@
+ CHECK_SRC= $(UI_DATA_C_SOURCES) $(GATEWAY_C_SOURCES)
+ INCLUDE_FLAGS = $(libsciui_data_la_CPPFLAGS)
+
+-libsciui_data_la_LIBADD = libsciui_data-algo.la
++libsciui_data_la_LIBADD = libsciui_data-algo.la $(X_LIBS) $(X_EXTRA_LIBS)
+
+
+ #### ui_data : gateway declaration ####
+Index: b/modules/umfpack/Makefile.am
+===================================================================
+--- a/modules/umfpack/Makefile.am
++++ b/modules/umfpack/Makefile.am
+@@ -29,16 +29,6 @@
+ libsciumfpack_la_etcdir = $(mydatadir)/etc
+ libsciumfpack_la_etc_DATA = etc/umfpack.quit etc/umfpack.start
+
+-if UMFPACK
+-
+-libsciumfpack_la_LDFLAGS += $(UMFPACK_LIB)
+-
+-if IS_MACOSX
+-# Crappy workaround to avoid an undefined symbol while using umfpack features
+-# For some unknown reasons, -lumfpack will not load cholmod & colamd
+-# libsciumfpack_la_LDFLAGS += -lcholmod -lcolamd
+-endif
+-
+ UMFPACK_C_SOURCES = src/c/taucs_scilab.c \
+ src/c/common_umfpack.c \
+ src/c/with_umfpack.c
+@@ -71,6 +61,16 @@
+
+ libsciumfpack_la_LIBADD = libsciumfpack-algo.la
+
++if UMFPACK
++
++libsciumfpack_la_LIBADD += $(UMFPACK_LIB)
++
++if IS_MACOSX
++# Crappy workaround to avoid an undefined symbol while using umfpack features
++# For some unknown reasons, -lumfpack will not load cholmod & colamd
++# libsciumfpack_la_LIBADD += -lcholmod -lcolamd
++endif
++
+ libsciumfpack_la_CPPFLAGS= -I$(srcdir)/includes/ \
+ -I$(srcdir)/src/c/ \
+ -I$(top_srcdir)/modules/dynamic_link/includes/ \
+Index: b/modules/xml/Makefile.am
+===================================================================
+--- a/modules/xml/Makefile.am
++++ b/modules/xml/Makefile.am
+@@ -103,13 +103,12 @@
+ pkglib_LTLIBRARIES = libscixml.la
+ noinst_LTLIBRARIES = libscixml-algo.la
+
+-libscixml_la_LDFLAGS = $(XML_LIBS) $(AM_LDFLAGS)
+-
+ libscixml_algo_la_SOURCES = $(XML_C_SOURCES) $(XML_JNI_SOURCES) $(XML_CXX_SOURCES)
+ libscixml_la_SOURCES = $(GATEWAY_C_SOURCES) $(GATEWAY_CXX_SOURCES)
+ libscixml_algo_la_CPPFLAGS = $(libscixml_la_CPPFLAGS)
+
+-libscixml_la_LIBADD = libscixml-algo.la
++libscixml_la_LDFLAGS = $(AM_LDFLAGS)
++libscixml_la_LIBADD = libscixml-algo.la $(XML_LIBS)
+
+ # For the code check (splint)
+ CHECK_SRC= $(XML_C_SOURCES) $(GATEWAY_C_SOURCES)
+Index: b/modules/cacsd/Makefile.am
+===================================================================
+--- a/modules/cacsd/Makefile.am
++++ b/modules/cacsd/Makefile.am
+@@ -215,7 +215,7 @@
+ endif
+
+
+-libscicacsd_la_LDFLAGS = $(ATLAS_LIBS) $(AM_LDFLAGS)
++libscicacsd_la_LDFLAGS = $(AM_LDFLAGS)
+
+ libscicacsd_algo_la_SOURCES = $(CACSD_FORTRAN_SOURCES) $(SLICOT_FORTRAN_SOURCES)
+ libscicacsd_la_SOURCES = $(GATEWAY_FORTRAN_SOURCES) $(GATEWAY_C_SOURCES)
+@@ -227,7 +227,7 @@
+ INCLUDE_FLAGS = $(libscicacsd_la_CPPFLAGS)
+
+
+-libscicacsd_la_LIBADD = libscicacsd-algo.la
++libscicacsd_la_LIBADD = libscicacsd-algo.la $(ATLAS_LIBS)
+
+
+ #### Target ######
+Index: b/modules/external_objects/Makefile.am
+===================================================================
+--- a/modules/external_objects/Makefile.am
++++ b/modules/external_objects/Makefile.am
+@@ -134,14 +134,14 @@
+ pkglib_LTLIBRARIES = libsciexternal_objects.la
+ noinst_LTLIBRARIES = libsciexternal_objects-algo.la
+
+-libsciexternal_objects_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION) $(LD_FLAGS) $(X_LIBS) $(X_EXTRA_LIBS)
++libsciexternal_objects_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION) $(LD_FLAGS)
+
+ libsciexternal_objects_algo_la_SOURCES = $(EXTERNAL_OBJECTS_C_SOURCES) $(EXTERNAL_OBJECTS_JNI_SOURCES) $(EXTERNAL_OBJECTS_CPP_SOURCES)
+ libsciexternal_objects_la_SOURCES = $(GATEWAY_C_SOURCES) $(GATEWAY_CPP_SOURCES)
+ libsciexternal_objects_algo_la_CFLAGS = $(libsciexternal_objects_la_CFLAGS)
+ libsciexternal_objects_algo_la_CPPFLAGS = $(libsciexternal_objects_la_CPPFLAGS)
+
+-libsciexternal_objects_la_LIBADD = libsciexternal_objects-algo.la
++libsciexternal_objects_la_LIBADD = libsciexternal_objects-algo.la $(X_LIBS) $(X_EXTRA_LIBS)
+
+ # For the code check (splint)
+ CHECK_SRC= $(EXTERNAL_OBJECTS_C_SOURCES) $(GATEWAY_C_SOURCES)
+Index: b/modules/fileio/Makefile.am
+===================================================================
+--- a/modules/fileio/Makefile.am
++++ b/modules/fileio/Makefile.am
+@@ -133,14 +133,14 @@
+ libscifileio_algo_la_SOURCES = $(FILEIO_SOURCES)
+ libscifileio_la_SOURCES = $(GATEWAY_SOURCES) $(GATEWAY_CXX_SOURCES)
+ libscifileio_algo_la_CPPFLAGS = $(libscifileio_la_CPPFLAGS)
+-libscifileio_algo_la_LDFLAGS = $(CURL_LIBS)
++libscifileio_algo_la_LIBADD = $(CURL_LIBS)
+
+ # For the code check (splint)
+ CHECK_SRC= $(FILEIO_SOURCES) $(GATEWAY_SOURCES)
+ INCLUDE_FLAGS = $(libscifileio_la_CPPFLAGS)
+
+ # pb of order $(top_builddir)/modules/console/libsciconsole.la
+-libscifileio_la_LIBADD = libscifileio-algo.la
++libscifileio_la_LIBADD = libscifileio-algo.la $(CURL_LIBS)
+
+ #### Target ######
+ modulename=fileio
+Index: b/modules/history_browser/Makefile.am
+===================================================================
+--- a/modules/history_browser/Makefile.am
++++ b/modules/history_browser/Makefile.am
+@@ -66,7 +66,8 @@
+ pkglib_LTLIBRARIES += libscihistory_browser.la
+ endif
+
+-libscihistory_browser_la_LDFLAGS = $(X_LIBS) $(X_EXTRA_LIBS) $(AM_LDFLAGS)
++libscihistory_browser_la_LDFLAGS = $(AM_LDFLAGS)
++libscihistory_browser_la_LIBADD = $(X_LIBS) $(X_EXTRA_LIBS)
+
+ libscihistory_browser_la_SOURCES = $(HISTORY_BROWSER_C_SOURCES) $(HISTORY_BROWSER_JNI_SOURCES) $(HISTORY_BROWSER_CXX_SOURCES) $(GATEWAY_C_SOURCES)
+
+Index: b/modules/jvm/Makefile.am
+===================================================================
+--- a/modules/jvm/Makefile.am
++++ b/modules/jvm/Makefile.am
+@@ -47,14 +47,14 @@
+ noinst_LTLIBRARIES = libscijvm-algo.la
+ endif
+
+-libscijvm_la_LDFLAGS = -lpthread $(XML_LIBS) $(JAVA_JNI_LIBS) $(AM_LDFLAGS)
++libscijvm_la_LDFLAGS = -pthread $(AM_LDFLAGS)
+
+ # FIXME: This a platform specific flag, this should be done on configure.ac
+ if IS_MACOSX
+ libscijvm_la_LDFLAGS += -framework JavaVM
+ endif
+
+-libscijvm_la_LIBADD = libscijvm-algo.la
++libscijvm_la_LIBADD = libscijvm-algo.la $(XML_LIBS) $(JAVA_JNI_LIBS)
+
+ #### jvm : gateway declaration ####
+ libscijvm_la_sci_gatewaydir = $(mydatadir)/sci_gateway
Modified: packages/scilab/branches/5.5/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.5/debian/patches/series?rev=46619&op=diff
==============================================================================
--- packages/scilab/branches/5.5/debian/patches/series (original)
+++ packages/scilab/branches/5.5/debian/patches/series Sun Apr 6 13:26:09 2014
@@ -2,3 +2,10 @@
librarypath.diff
missingaddchapter.diff
disable-xcos-dep-check.diff
+fix-binary-linking.diff
+fix-lib-linking.diff
+
+# these following two patches don't work yet ...
+# build order needs sorting out
+add-lib-dependencies.diff
+#disable-no-as-needed.diff
Modified: packages/scilab/branches/5.5/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.5/debian/rules?rev=46619&op=diff
==============================================================================
--- packages/scilab/branches/5.5/debian/rules (original)
+++ packages/scilab/branches/5.5/debian/rules Sun Apr 6 13:26:09 2014
@@ -2,12 +2,13 @@
include /usr/share/cdbs/1/rules/buildcore.mk
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/autoreconf.mk
# Detect the arch (with the naming of Sun)
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-archdir_map := amd64=amd64 i386=i386 lpia=i386 powerpc=ppc sparc=sparc ia64=ia64 armel=arm mips=mips mipsel=mipsel
+archdir_map := amd64=amd64 i386=i386 lpia=i386 powerpc=ppc sparc=sparc ia64=ia64 armel=arm mips=mips mipsel=mipsel ppc64el=ppc64le arm64=aarch64
archdir := $(strip $(patsubst $(DEB_HOST_ARCH)=%, %, \
$(filter $(DEB_HOST_ARCH)=%, $(archdir_map))))
@@ -22,7 +23,6 @@
# --enable-compilation-tests
DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--no-as-needed"
-
ENABLE_BUILD_HELP_ARCHS := amd64 i386
ifneq (,$(findstring $(DEB_HOST_ARCH),$(ENABLE_BUILD_HELP_ARCHS)))
More information about the debian-science-commits
mailing list