[scilab] 01/01: Add patch to compile even when no writable HOME is available
Julien Puydt
julien.puydt at laposte.net
Sun Nov 26 20:29:10 UTC 2017
This is an automated email from the git hooks/post-receive script.
jpuydt-guest pushed a commit to branch master
in repository scilab.
commit 5a52125bcd35f37f16280041da98d86c661eb92f
Author: Julien Puydt <julien.puydt at laposte.net>
Date: Sun Nov 26 12:21:07 2017 +0100
Add patch to compile even when no writable HOME is available
---
debian/changelog | 1 +
debian/patches/no_homedir.patch | 79 +++++++++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 81 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index a33e694..8b23836 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,6 +30,7 @@ scilab (6.0.0-1) UNRELEASED; urgency=medium
- Refresh patch to fix the build with OCaml 4.05.
- Add new build-depends.
- Add patch to handle the lucene 4.10 api.
+ - Add patch to compile even without HOME.
* Rework the manpages.
* Modernize the appstream and desktop files.
diff --git a/debian/patches/no_homedir.patch b/debian/patches/no_homedir.patch
new file mode 100644
index 0000000..ffda8fc
--- /dev/null
+++ b/debian/patches/no_homedir.patch
@@ -0,0 +1,79 @@
+Description: make the compilation work when no writable HOME is available
+Author: Julien Puydt
+Forwarded: no
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -167,7 +167,7 @@
+ endif
+
+ # check is performed with scilab, so use the serial-tests on purpose
+-TESTS_ENVIRONMENT = LANG=C $(top_builddir)/bin/scilab-cli -nb -noatomsautoload -f
++TESTS_ENVIRONMENT = LANG=C HOME=/tmp $(top_builddir)/bin/scilab-cli -nb -noatomsautoload -nouserstartup -f
+ TESTS = $(top_builddir)/modules/development_tools/tests/unit_tests/test_run_level_1.tst
+
+ all-local: $(TARGETS_ALL)
+@@ -195,8 +195,8 @@
+
+ macros: $(top_builddir)/scilab-cli-bin $(top_builddir)/bin/scilab-cli check-jvm-dep check-libstdcpp-dep
+ -@( cd $(top_builddir) ; \
+- echo "$(top_builddir)/bin/scilab-cli -ns -noatomsautoload -quit -f modules/functions/scripts/buildmacros/buildmacros.sce" ; \
+- $(top_builddir)/bin/scilab-cli -ns -noatomsautoload -quit -f modules/functions/scripts/buildmacros/buildmacros.sce) || exit 1
++ echo "$(top_builddir)/bin/scilab-cli -ns -noatomsautoload -nouserstartup -quit -f modules/functions/scripts/buildmacros/buildmacros.sce" ; \
++ HOME=/tmp $(top_builddir)/bin/scilab-cli -ns -noatomsautoload -nouserstartup -quit -f modules/functions/scripts/buildmacros/buildmacros.sce) || exit 1
+
+ strip-debug:
+ find $(top_builddir) -name '*.so.?.?.?' | while read file ; \
+@@ -279,8 +279,8 @@
+ for l in $(ALL_LINGUAS_DOC); do \
+ echo "-- Building documentation ($$l) --"; \
+ COMMAND="try xmltojar([],[],'$$l');catch disp(lasterror()); exit(-1);end;exit(0);"; \
+- echo "LANG=$$l.UTF-8 LC_ALL=C SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 _JAVA_OPTIONS='-Djava.awt.headless=true' $(top_builddir)/bin/scilab-adv-cli -noatomsautoload -nb -l $$l -nouserstartup -e \"$$COMMAND\"";\
+- LANG=$$l.UTF-8 LC_ALL=C SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 _JAVA_OPTIONS='-Djava.awt.headless=true' $(top_builddir)/bin/scilab-adv-cli -noatomsautoload -nb -l $$l -nouserstartup -e "$$COMMAND" || exit 1;\
++ echo "LANG=$$l.UTF-8 LC_ALL=C SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 _JAVA_OPTIONS='-Djava.awt.headless=true' HOME=/tmp $(top_builddir)/bin/scilab-adv-cli -noatomsautoload -nb -l $$l -nouserstartup -e \"$$COMMAND\"";\
++ LANG=$$l.UTF-8 LC_ALL=C SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 _JAVA_OPTIONS='-Djava.awt.headless=true' HOME=/tmp $(top_builddir)/bin/scilab-adv-cli -noatomsautoload -nb -l $$l -nouserstartup -e "$$COMMAND" || exit 1;\
+ done; \
+ else \
+ echo "Cannot find Scilab-adv-cli binary"; \
+@@ -296,8 +296,8 @@
+ for l in $(ALL_LINGUAS_DOC); do \
+ echo "-- Building documentation ($$l) --"; \
+ COMMAND="try xmltoweb([],[],'$$l');catch exit(-1);end;exit(0);";\
+- echo "LANG=$$l.UTF-8 SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 $(top_builddir)/bin/scilab-adv-cli -nb -l $$l -noatomsautoload -nouserstartup -e \"$$COMMAND\"";\
+- LANG=$$l.UTF-8 SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 $(top_builddir)/bin/scilab-adv-cli -nb -l $$l -noatomsautoload -nouserstartup -e "$$COMMAND" || exit 1;\
++ echo "LANG=$$l.UTF-8 SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 HOME=/tmp $(top_builddir)/bin/scilab-adv-cli -nb -l $$l -noatomsautoload -nouserstartup -e \"$$COMMAND\"";\
++ LANG=$$l.UTF-8 SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 HOME=/tmp $(top_builddir)/bin/scilab-adv-cli -nb -l $$l -noatomsautoload -nouserstartup -e "$$COMMAND" || exit 1;\
+ JAVADOC_TARGET=$(top_builddir)/modules/helptools/web/$$l/javasci; \
+ if test ! -d $$JAVADOC_TARGET; then \
+ mkdir $$JAVADOC_TARGET; \
+@@ -328,8 +328,8 @@
+ for l in $(ALL_LINGUAS_DOC); do \
+ echo "-- Checking documentation ($$l) --"; \
+ COMMAND="try check_help();catch exit(-1);end;exit(0);";\
+- echo "$(top_builddir)/bin/scilab-cli -nb -l $$l -noatomsautoload -e \"$$COMMAND\"";\
+- $(top_builddir)/bin/scilab-cli -nb -l $$l -noatomsautoload -e "$$COMMAND" || exit 1;\
++ echo "$(top_builddir)/bin/scilab-cli -nb -l $$l -noatomsautoload -nouserstartup -e \"$$COMMAND\"";\
++ HOME=/tmp $(top_builddir)/bin/scilab-cli -nb -l $$l -noatomsautoload -nouserstartup -e "$$COMMAND" || exit 1;\
+ done; \
+ else \
+ echo "Cannot find Scilab binary"; \
+@@ -368,8 +368,8 @@
+ - at if test -x $(top_builddir)/scilab-cli-bin; then \
+ COMMAND="try clean_help();catch exit(-1);end;exit(0)"; \
+ for l in $(ALL_LINGUAS_DOC); do \
+- echo "$(top_builddir)/bin/scilab-cli -nb -l $$l -noatomsautoload -e '$$COMMAND'"; \
+- $(top_builddir)/bin/scilab-cli -nb -l $$l -noatomsautoload -e "$$COMMAND" || exit 1; \
++ echo "$(top_builddir)/bin/scilab-cli -nb -l $$l -noatomsautoload -nouserstartup -e '$$COMMAND'"; \
++ HOME=/tmp $(top_builddir)/bin/scilab-cli -nb -l $$l -noatomsautoload -nouserstartup -e "$$COMMAND" || exit 1; \
+ done; \
+ else \
+ echo "Cannot find Scilab binary"; \
+@@ -389,7 +389,7 @@
+
+ clean-tests:
+ @if test -x $(top_builddir)/scilab-cli-bin; then \
+- $(top_builddir)/bin/scilab-cli -nb -noatomsautoload -l fr -e 'try test_clean();catch exit(-1);end;exit(0);' || exit 1; \
++ HOME=/tmp $(top_builddir)/bin/scilab-cli -nb -noatomsautoload -nouserstartup -l fr -e 'try test_clean();catch exit(-1);end;exit(0);' || exit 1; \
+ else \
+ echo "Cannot find Scilab binary"; \
+ fi
diff --git a/debian/patches/series b/debian/patches/series
index 4d33a99..d56024c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,3 +13,4 @@ lucene_4.10.patch
spelling.patch
appstream.patch
desktop_files.patch
+no_homedir.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/scilab.git
More information about the debian-science-commits
mailing list