r44149 - /packages/scilab/branches/snapshot/debian/patches/0001-Call_scilab-should-be-available-as-an-external-lib.patch

sylvestre at users.alioth.debian.org sylvestre at users.alioth.debian.org
Tue Dec 13 15:32:12 UTC 2011 

Author: sylvestre
Date: Tue Dec 13 15:32:12 2011
New Revision: 44149

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44149
Log:
patch to fix a module link issue

Added:
    packages/scilab/branches/snapshot/debian/patches/0001-Call_scilab-should-be-available-as-an-external-lib.patch

Added: packages/scilab/branches/snapshot/debian/patches/0001-Call_scilab-should-be-available-as-an-external-lib.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/snapshot/debian/patches/0001-Call_scilab-should-be-available-as-an-external-lib.patch?rev=44149&op=file
==============================================================================
--- packages/scilab/branches/snapshot/debian/patches/0001-Call_scilab-should-be-available-as-an-external-lib.patch (added)
+++ packages/scilab/branches/snapshot/debian/patches/0001-Call_scilab-should-be-available-as-an-external-lib.patch Tue Dec 13 15:32:12 2011
@@ -1,0 +1,108 @@
+diff --git scilab.orig/modules/Makefile.am scilab/modules/Makefile.am
+index bbd8c81..a208817 100644
+--- scilab.orig/modules/Makefile.am
++++ scilab/modules/Makefile.am
+@@ -189,7 +189,6 @@ ENGINE_LIBS =	$(top_builddir)/modules/fileio/libscifileio.la \
+ 	$(top_builddir)/modules/string/libscistring.la \
+ 	$(top_builddir)/modules/hdf5/libscihdf5.la \
+ 	$(top_builddir)/modules/fftw/libscifftw.la \
+-	$(top_builddir)/modules/xml/libscixml.la \
+     $(top_builddir)/modules/statistics/libscistatistics.la \
+     $(top_builddir)/modules/dynamic_link/libscidynamic_link.la \
+ 	$(top_builddir)/libs/dynamiclibrary/libscidynamiclibrary.la
+@@ -210,6 +209,7 @@ ENGINE_LIBS_DYNAMIC_LOAD = \
+ 	$(top_builddir)/modules/umfpack/libsciumfpack.la \
+ 	$(top_builddir)/modules/matio/libscimatio.la \
+ 	$(top_builddir)/modules/helptools/libscihelptools.la \
++	$(top_builddir)/modules/xml/libscixml.la \
+ 	$(top_builddir)/modules/parallel/libsciparallel.la
+ 
+ 
+diff --git scilab.orig/modules/Makefile.in scilab/modules/Makefile.in
+index 7eebe7d..6a7d3bb 100644
+--- scilab.orig/modules/Makefile.in
++++ scilab/modules/Makefile.in
+@@ -529,7 +529,6 @@ ENGINE_LIBS = $(top_builddir)/modules/fileio/libscifileio.la \
+ 	$(top_builddir)/modules/string/libscistring.la \
+ 	$(top_builddir)/modules/hdf5/libscihdf5.la \
+ 	$(top_builddir)/modules/fftw/libscifftw.la \
+-	$(top_builddir)/modules/xml/libscixml.la \
+     $(top_builddir)/modules/statistics/libscistatistics.la \
+     $(top_builddir)/modules/dynamic_link/libscidynamic_link.la \
+ 	$(top_builddir)/libs/dynamiclibrary/libscidynamiclibrary.la
+@@ -551,6 +550,7 @@ ENGINE_LIBS_DYNAMIC_LOAD = \
+ 	$(top_builddir)/modules/umfpack/libsciumfpack.la \
+ 	$(top_builddir)/modules/matio/libscimatio.la \
+ 	$(top_builddir)/modules/helptools/libscihelptools.la \
++	$(top_builddir)/modules/xml/libscixml.la \
+ 	$(top_builddir)/modules/parallel/libsciparallel.la
+ 
+ 
+diff --git scilab.orig/modules/call_scilab/Makefile.am scilab/modules/call_scilab/Makefile.am
+index aaf915b..2581297 100644
+--- scilab.orig/modules/call_scilab/Makefile.am
++++ scilab/modules/call_scilab/Makefile.am
+@@ -25,13 +25,8 @@ libscicall_scilab_la_CFLAGS=  	-I$(srcdir)/includes/ \
+ 			-I$(top_srcdir)/modules/graphics/includes \
+ 			-I$(top_srcdir)/modules/core/src/c/
+ 
+-if MAINTAINER_MODE
+ pkglib_LTLIBRARIES = libscicall_scilab.la
+ noinst_LTLIBRARIES = libscicall_scilab-algo.la
+-else
+-noinst_LTLIBRARIES = libscicall_scilab-algo.la libscicall_scilab.la
+-endif
+-
+ 
+ libscicall_scilab_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION)
+ 
+diff --git scilab.orig/modules/call_scilab/Makefile.in scilab/modules/call_scilab/Makefile.in
+index fdcc833..190d2b6 100644
+--- scilab.orig/modules/call_scilab/Makefile.in
++++ scilab/modules/call_scilab/Makefile.in
+@@ -124,8 +124,6 @@ libscicall_scilab_algo_la_LINK = $(LIBTOOL) --tag=CC \
+ 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+ 	$(libscicall_scilab_algo_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+ 	$(LDFLAGS) -o $@
+- at MAINTAINER_MODE_FALSE@am_libscicall_scilab_algo_la_rpath =
+- at MAINTAINER_MODE_TRUE@am_libscicall_scilab_algo_la_rpath =
+ libscicall_scilab_la_DEPENDENCIES = libscicall_scilab-algo.la
+ am__objects_2 = libscicall_scilab_la-sci_fromjava.lo \
+ 	libscicall_scilab_la-sci_fromc.lo \
+@@ -136,9 +134,6 @@ libscicall_scilab_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ 	$(LIBTOOLFLAGS) --mode=link $(CCLD) \
+ 	$(libscicall_scilab_la_CFLAGS) $(CFLAGS) \
+ 	$(libscicall_scilab_la_LDFLAGS) $(LDFLAGS) -o $@
+- at MAINTAINER_MODE_FALSE@am_libscicall_scilab_la_rpath =
+- at MAINTAINER_MODE_TRUE@am_libscicall_scilab_la_rpath = -rpath \
+- at MAINTAINER_MODE_TRUE@	$(pkglibdir)
+ DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/modules/core/includes
+ depcomp = $(SHELL) $(top_srcdir)/config/depcomp
+ am__depfiles_maybe = depfiles
+@@ -434,9 +429,8 @@ libscicall_scilab_la_CFLAGS = -I$(srcdir)/includes/ \
+ 			-I$(top_srcdir)/modules/graphics/includes \
+ 			-I$(top_srcdir)/modules/core/src/c/
+ 
+- at MAINTAINER_MODE_TRUE@pkglib_LTLIBRARIES = libscicall_scilab.la
+- at MAINTAINER_MODE_FALSE@noinst_LTLIBRARIES = libscicall_scilab-algo.la libscicall_scilab.la
+- at MAINTAINER_MODE_TRUE@noinst_LTLIBRARIES = libscicall_scilab-algo.la
++pkglib_LTLIBRARIES = libscicall_scilab.la
++noinst_LTLIBRARIES = libscicall_scilab-algo.la
+ libscicall_scilab_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION)
+ libscicall_scilab_algo_la_SOURCES = $(CALLSCILAB_C_SOURCES)
+ libscicall_scilab_la_SOURCES = $(GATEWAY_C_SOURCES)
+@@ -605,9 +599,9 @@ clean-pkglibLTLIBRARIES:
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ libscicall_scilab-algo.la: $(libscicall_scilab_algo_la_OBJECTS) $(libscicall_scilab_algo_la_DEPENDENCIES) 
+-	$(libscicall_scilab_algo_la_LINK) $(am_libscicall_scilab_algo_la_rpath) $(libscicall_scilab_algo_la_OBJECTS) $(libscicall_scilab_algo_la_LIBADD) $(LIBS)
++	$(libscicall_scilab_algo_la_LINK)  $(libscicall_scilab_algo_la_OBJECTS) $(libscicall_scilab_algo_la_LIBADD) $(LIBS)
+ libscicall_scilab.la: $(libscicall_scilab_la_OBJECTS) $(libscicall_scilab_la_DEPENDENCIES) 
+-	$(libscicall_scilab_la_LINK) $(am_libscicall_scilab_la_rpath) $(libscicall_scilab_la_OBJECTS) $(libscicall_scilab_la_LIBADD) $(LIBS)
++	$(libscicall_scilab_la_LINK) -rpath $(pkglibdir) $(libscicall_scilab_la_OBJECTS) $(libscicall_scilab_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+-- 
+1.7.7.3
+

More information about the debian-science-commits mailing list