[getfem] 03/07: Disable scilab.
Anton Gladky
gladk at moszumanska.debian.org
Tue Aug 9 21:09:32 UTC 2016
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch master
in repository getfem.
commit 18eec2c345752f81f9fcae6cffc3b12c7c209817
Author: Anton Gladky <gladk at debian.org>
Date: Tue Aug 9 21:41:50 2016 +0200
Disable scilab.
---
debian/patches/02_addgetfempath.diff | 17 ------
debian/patches/03_disableXaccess.diff | 20 -------
debian/patches/07_disable_scilab.patch | 99 ++++++++++++++++++++++++++++++++++
debian/patches/series | 3 +-
4 files changed, 100 insertions(+), 39 deletions(-)
diff --git a/debian/patches/02_addgetfempath.diff b/debian/patches/02_addgetfempath.diff
deleted file mode 100644
index 3affea9..0000000
--- a/debian/patches/02_addgetfempath.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: _addgetfempath.diff
-Index: getfem++-5.0+dfsg1/interface/src/scilab/etc/sci_getfem.start
-===================================================================
---- getfem++-5.0+dfsg1.orig/interface/src/scilab/etc/sci_getfem.start
-+++ getfem++-5.0+dfsg1/interface/src/scilab/etc/sci_getfem.start
-@@ -15,6 +15,11 @@ etc_tlbx = get_absolute_file_path("sci_
- etc_tlbx = getshortpathname(etc_tlbx);
- root_tlbx = strncpy( etc_tlbx, length(etc_tlbx)-length("\etc\") );
-
-+// Load the native library
-+a=ls("/usr//lib/libgetfem.so*");
-+link(a(1));
-+clear a;
-+
- //Load functions library
- // =============================================================================
- mprintf("\tLoad macros\n");
diff --git a/debian/patches/03_disableXaccess.diff b/debian/patches/03_disableXaccess.diff
deleted file mode 100644
index 91d3098..0000000
--- a/debian/patches/03_disableXaccess.diff
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: _disableXaccess.diff
-Index: getfem++-5.0+dfsg1/interface/src/scilab/Makefile.am
-===================================================================
---- getfem++-5.0+dfsg1.orig/interface/src/scilab/Makefile.am
-+++ getfem++-5.0+dfsg1/interface/src/scilab/Makefile.am
-@@ -386,7 +386,7 @@ EXTRA_DIST=builddoc.sce \
- .NOTPARALLEL: *
-
- all:
-- @SCILAB_EXE@ -nw -nb -f $(scilabbuilddir)/makefile_builder.sce
-+ SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 @SCILAB_EXE@ -nw -nb -f $(scilabbuilddir)/makefile_builder.sce
-
- install:
- $(mkinstalldirs) $(toolboxdir)/demos
-@@ -457,4 +457,4 @@ install:
- @INSTALL@ -D -m 644 -t $(toolboxdir)/ $(scilabbasedir)
-
- clean:
-- @SCILAB_EXE@ -nw -nb -f $(scilabbuilddir)/makefile_cleaner.sce
-+ SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 @SCILAB_EXE@ -nw -nb -f $(scilabbuilddir)/makefile_cleaner.sce
diff --git a/debian/patches/07_disable_scilab.patch b/debian/patches/07_disable_scilab.patch
new file mode 100644
index 0000000..16bba38
--- /dev/null
+++ b/debian/patches/07_disable_scilab.patch
@@ -0,0 +1,99 @@
+Description: Disable scilab
+Author: Anton Gladky <gladk at debian.org>
+Last-Update: 2016-08-08
+
+Index: getfem/interface/src/Makefile.am
+===================================================================
+--- getfem.orig/interface/src/Makefile.am
++++ getfem/interface/src/Makefile.am
+@@ -6,12 +6,7 @@ if BUILDPYTHON
+ subdirPYTHON=python
+ endif
+
+-if BUILDSCILAB
+-subdirSCILAB=scilab
+-.NOTPARALLEL: scilab
+-endif
+-
+-SUBDIRS = . $(subdirMATLAB) $(subdirPYTHON) $(subdirSCILAB)
++SUBDIRS = . $(subdirMATLAB) $(subdirPYTHON)
+
+ RPC_INC_DIR=@RPC_INC_DIR@
+
+Index: getfem/m4/Makefile.in
+===================================================================
+--- getfem.orig/m4/Makefile.in
++++ getfem/m4/Makefile.in
+@@ -92,7 +92,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
+ $(top_srcdir)/m4/ax_prog_fc_mpi.m4 $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+- $(top_srcdir)/m4/scilab.m4 $(top_srcdir)/configure.ac
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -275,7 +274,6 @@ datarootdir = @datarootdir@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-has_scilab = @has_scilab@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+Index: getfem/configure.ac
+===================================================================
+--- getfem.orig/configure.ac
++++ getfem/configure.ac
+@@ -977,43 +977,6 @@ fi
+ AM_CONDITIONAL(BUILDPYTHON, test x$usepython = xYES)
+ AM_CONDITIONAL(BUILDPYTHONPAR, test x$ac_python_mpi4py = xYES)
+
+-dnl -----------------------------------------------
+-dnl SCILAB Interface
+-dnl -----------------------------------------------
+-
+-m4_include([m4/scilab.m4])
+-
+-REQUIRED_SCILAB_MAJOR=5
+-REQUIRED_SCILAB_MINOR=2
+-REQUIRED_SCILAB_MICRO=0
+-
+-AC_CHECK_SCILAB
+-
+-GETFEM_INTERFACE_PATH="`readlink -f $srcdir`"
+-GETFEM_BUILD_INTERFACE_PATH="`readlink -f $PWD`"
+-AC_SUBST(GETFEM_INTERFACE_PATH)
+-AC_SUBST(GETFEM_BUILD_INTERFACE_PATH)
+-
+-dnl if the scilab directory doesn't exists, we copy the
+-dnl scilab sources into the build directory
+-
+-if test "x$usescilab" == "xYES"
+-then
+- currentdir=`pwd`
+- if test ! -f $currentdir/interface/src/scilab/builder.sce
+- then
+- echo "Copying Scilab toolbox src in the build directory"
+- mkdir -p $currentdir/interface/src/scilab/
+- cp -r $srcdir/interface/src/scilab/* $currentdir/interface/src/scilab
+- fi
+-fi
+-
+-AC_ARG_WITH(scilab-toolbox-dir,
+- [AS_HELP_STRING([--with-scilab-toolbox-dir],[directory in which the scilab interface will be installed])],
+- SCILAB_TOOLBOX_DIR="$withval",SCILAB_TOOLBOX_DIR="$GFPREFIX/getfem_toolbox")
+-AC_SUBST(SCILAB_TOOLBOX_DIR)
+-
+-
+
+ dnl -----------------------------------------------
+ dnl Outputs
+@@ -1053,8 +1016,6 @@ interface/src/matlab/Makefile
+ interface/src/matlab/private/Makefile \
+ interface/src/python/Makefile \
+ interface/src/python/setup.py \
+-interface/src/scilab/Makefile \
+-interface/src/scilab/sci_gateway/c/builder_gateway_c.sce \
+ interface/tests/Makefile \
+ interface/tests/meshes/Makefile \
+ interface/tests/matlab/Makefile \
diff --git a/debian/patches/series b/debian/patches/series
index 9928370..f9bde1f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
-02_addgetfempath.diff
-03_disableXaccess.diff
04_fix_FTBFS.patch
05_disable_failing_test.patch
06_gcc-6.patch
+07_disable_scilab.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/getfem.git
More information about the debian-science-commits
mailing list