Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=81dad75a4a694448a39f7e6038796465dc63abac
commit 81dad75a4a694448a39f7e6038796465dc63abac Author: DeX77 <[email protected]> Date: Sun Sep 27 20:43:18 2015 +0200 scilab-5.5.2-2-x86_64 * rebuild * fix linkage against deprecated libs what a mess.. diff --git a/source/xapps-extra/scilab/FrugalBuild b/source/xapps-extra/scilab/FrugalBuild index 7e98515..c8ffd7d 100644 --- a/source/xapps-extra/scilab/FrugalBuild +++ b/source/xapps-extra/scilab/FrugalBuild @@ -5,18 +5,24 @@ options+=('asneeded') pkgname=scilab pkgver=5.5.2 -pkgrel=1 +pkgrel=2 pkgdesc="Scilab is a scientific software package for numerical computations." url="http://www.scilab.org"; -depends=('pcre>=8.30' 'libgfortran>=4.6.1' 'libgomp>=4.6.1' 'libxml2>=2.7.8' 'fftw>=3.2.2' 'hdf5>=1.8.7' 'arpack-ng' 'tk' 'lapack>=3.3.1-2' 'curl') -makedepends=('gcc-gfortran>=4.5.2-2' 'blas>=3.3.1' 'umfpack>=5.5.1' 'ocaml>=3.12.1') +depends=('pcre>=8.30' 'libgfortran>=4.6.1' 'libgomp>=4.6.1' 'libxml2>=2.7.8' \ + 'fftw>=3.2.2' 'hdf5>=1.8.7' 'arpack-ng' 'lapack>=3.5.0' 'curl>=7.44' \ + 'blas>=3.5.0' 'tk>=8.6.1' 'libgl') +makedepends=('gcc-gfortran>=4.5.2-2' 'umfpack>=5.5.1' 'ocaml>=3.12.1') Finclude openjava groups=('xapps-extra') archs=('i686' 'x86_64') options=('scriptlet') up2date="Flastarchive $url/development/sources/stable -src.*.tar.gz" -source=($url/download/$pkgver/$pkgname-$pkgver-src.tar.gz) -sha1sums=('93057510f2b9089f39c557f45821146c1f6923b7') +source=($url/download/$pkgver/$pkgname-$pkgver-src.tar.gz \ + depend-scicos.patch \ + librarypath.patch ) +sha1sums=('93057510f2b9089f39c557f45821146c1f6923b7' \ + '220917aca15d5e13530a219070aa54802bd425df' \ + '0a3cf4eddc998a81ab7c3ca10d7ed4b8a7503888' ) if [ "$CARCH" = "i686" ]; then source=(${source[@]} $url/download/$pkgver/prerequirements-$pkgname-$pkgver-src.tar.gz) @@ -26,14 +32,33 @@ elif [ "$CARCH" = "x86_64" ]; then sha1sums=("${sha1sums[@]}" 'fe274a251405913a5fd2d32a05720d36190d3181') fi +Fconfopts+=" --enable-build-localization \ + --with-fftw \ + --with-modelica \ + --with-gfortran \ + --with-umfpack \ + --without-matio \ + --disable-static-system-lib \ + --with-tcl-library=/usr/lib" + + build() { Fcd - sed -i '15090s|thirdparty|thirdparty/checkstyle|' configure || Fdie - Fconf --enable-build-localization \ - --with-fftw --with-modelica --with-gfortran \ - --with-umfpack --without-matio --disable-static-system-lib - cp etc/classpath.xml.vc etc/classpath.xml || Fdie - make || Fdie + Fpatchall + + Fexec rm -rf usr/{bin,lib} + Fexec rm -rf lib/thirdparty/{libblas.so.3gf,libcrypto.so.0.9.8,liblapack.so.3gf,libssl.so.0.9.8,libtcl8.5.so,libtk8.5.so,libcurl.so.4.1.1,libarpack.so.2.0.0,libumfpack.so.5.6.2} + + Fautogen + + Fexec sed -i '15090s|thirdparty|thirdparty/checkstyle|' configure + + export CPPFLAGS=" -I/usr/include/libxml2 " + export LDFLAGS=" -L/usr/lib -lxml2" + + Fconf + Fexcec cp etc/classpath.xml.vc etc/classpath.xml + Fmake Fmakeinstall Fmkdir usr/share/scilab/thirdparty Fcprel "thirdparty/*.jar" usr/share/scilab/thirdparty/ diff --git a/source/xapps-extra/scilab/depend-scicos.patch b/source/xapps-extra/scilab/depend-scicos.patch new file mode 100644 index 0000000..bcaa962 --- /dev/null +++ b/source/xapps-extra/scilab/depend-scicos.patch @@ -0,0 +1,308 @@ +Index: scilab-5.5.0/modules/scicos/.depend +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ scilab-5.5.0/modules/scicos/.depend 2014-04-11 15:12:06.094927858 +0200 +@@ -0,0 +1,303 @@ ++src/modelica_compiler/parseTree.cmi: ++src/modelica_compiler/linenum.cmi: ++src/modelica_compiler/parser.cmi: ./src/modelica_compiler/parseTree.cmi ++src/modelica_compiler/lexer.cmi: ./src/translator/parsing/parser.cmi ++src/modelica_compiler/precompilation.cmi: \ ++ ./src/modelica_compiler/parseTree.cmi ++src/modelica_compiler/compilation.cmi: \ ++ ./src/modelica_compiler/precompilation.cmi ++src/modelica_compiler/instantiation.cmi: \ ++ ./src/modelica_compiler/compilation.cmi ++src/modelica_compiler/graphNodeSet.cmi: ++src/modelica_compiler/symbolicExpression.cmi: ++src/modelica_compiler/squareSparseMatrix.cmi: ++src/modelica_compiler/bipartiteGraph.cmi: ++src/modelica_compiler/hungarianMethod.cmi: ++src/modelica_compiler/causalityGraph.cmi: ++src/modelica_compiler/optimization.cmi: \ ++ ./src/modelica_compiler/symbolicExpression.cmi \ ++ ./src/translator/instantiation/instantiation.cmi \ ++ ./src/modelica_compiler/compilation.cmi ++src/modelica_compiler/xMLCodeGeneration.cmi: \ ++ ./src/modelica_compiler/optimization.cmi ++src/modelica_compiler/optimizingCompiler.cmi: \ ++ ./src/modelica_compiler/optimization.cmi ++src/modelica_compiler/scicosCodeGeneration.cmi: \ ++ ./src/modelica_compiler/optimization.cmi ++src/modelica_compiler/scicosOptimizingCompiler.cmi: ++src/modelica_compiler/parseTree.cmo: src/modelica_compiler/parseTree.cmi ++src/modelica_compiler/parseTree.cmx: src/modelica_compiler/parseTree.cmi ++src/modelica_compiler/linenum.cmo: src/modelica_compiler/linenum.cmi ++src/modelica_compiler/linenum.cmx: src/modelica_compiler/linenum.cmi ++src/modelica_compiler/parser.cmo: ./src/modelica_compiler/parseTree.cmi \ ++ ./src/translator/parsing/linenum.cmi src/modelica_compiler/parser.cmi ++src/modelica_compiler/parser.cmx: ./src/modelica_compiler/parseTree.cmx \ ++ ./src/translator/parsing/linenum.cmx src/modelica_compiler/parser.cmi ++src/modelica_compiler/lexer.cmo: ./src/translator/parsing/parser.cmi \ ++ src/modelica_compiler/lexer.cmi ++src/modelica_compiler/lexer.cmx: ./src/translator/parsing/parser.cmx \ ++ src/modelica_compiler/lexer.cmi ++src/modelica_compiler/precompilation.cmo: \ ++ ./src/modelica_compiler/parseTree.cmi \ ++ src/modelica_compiler/precompilation.cmi ++src/modelica_compiler/precompilation.cmx: \ ++ ./src/modelica_compiler/parseTree.cmx \ ++ src/modelica_compiler/precompilation.cmi ++src/modelica_compiler/compilation.cmo: \ ++ ./src/modelica_compiler/precompilation.cmi \ ++ ./src/modelica_compiler/parseTree.cmi \ ++ src/modelica_compiler/compilation.cmi ++src/modelica_compiler/compilation.cmx: \ ++ ./src/modelica_compiler/precompilation.cmx \ ++ ./src/modelica_compiler/parseTree.cmx \ ++ src/modelica_compiler/compilation.cmi ++src/modelica_compiler/instantiation.cmo: \ ++ ./src/modelica_compiler/compilation.cmi \ ++ src/modelica_compiler/instantiation.cmi ++src/modelica_compiler/instantiation.cmx: \ ++ ./src/modelica_compiler/compilation.cmx \ ++ src/modelica_compiler/instantiation.cmi ++src/modelica_compiler/graphNodeSet.cmo: \ ++ src/modelica_compiler/graphNodeSet.cmi ++src/modelica_compiler/graphNodeSet.cmx: \ ++ src/modelica_compiler/graphNodeSet.cmi ++src/modelica_compiler/symbolicExpression.cmo: \ ++ ./src/modelica_compiler/graphNodeSet.cmi \ ++ src/modelica_compiler/symbolicExpression.cmi ++src/modelica_compiler/symbolicExpression.cmx: \ ++ ./src/modelica_compiler/graphNodeSet.cmx \ ++ src/modelica_compiler/symbolicExpression.cmi ++src/modelica_compiler/squareSparseMatrix.cmo: \ ++ src/modelica_compiler/squareSparseMatrix.cmi ++src/modelica_compiler/squareSparseMatrix.cmx: \ ++ src/modelica_compiler/squareSparseMatrix.cmi ++src/modelica_compiler/bipartiteGraph.cmo: \ ++ src/modelica_compiler/bipartiteGraph.cmi ++src/modelica_compiler/bipartiteGraph.cmx: \ ++ src/modelica_compiler/bipartiteGraph.cmi ++src/modelica_compiler/hungarianMethod.cmo: \ ++ src/modelica_compiler/hungarianMethod.cmi ++src/modelica_compiler/hungarianMethod.cmx: \ ++ src/modelica_compiler/hungarianMethod.cmi ++src/modelica_compiler/causalityGraph.cmo: \ ++ src/modelica_compiler/causalityGraph.cmi ++src/modelica_compiler/causalityGraph.cmx: \ ++ src/modelica_compiler/causalityGraph.cmi ++src/modelica_compiler/optimization.cmo: \ ++ ./src/modelica_compiler/symbolicExpression.cmi \ ++ ./src/modelica_compiler/squareSparseMatrix.cmi \ ++ ./src/translator/instantiation/instantiation.cmi \ ++ ./src/modelica_compiler/hungarianMethod.cmi \ ++ ./src/modelica_compiler/compilation.cmi \ ++ ./src/modelica_compiler/causalityGraph.cmi \ ++ ./src/modelica_compiler/bipartiteGraph.cmi \ ++ src/modelica_compiler/optimization.cmi ++src/modelica_compiler/optimization.cmx: \ ++ ./src/modelica_compiler/symbolicExpression.cmx \ ++ ./src/modelica_compiler/squareSparseMatrix.cmx \ ++ ./src/translator/instantiation/instantiation.cmx \ ++ ./src/modelica_compiler/hungarianMethod.cmx \ ++ ./src/modelica_compiler/compilation.cmx \ ++ ./src/modelica_compiler/causalityGraph.cmx \ ++ ./src/modelica_compiler/bipartiteGraph.cmx \ ++ src/modelica_compiler/optimization.cmi ++src/modelica_compiler/xMLCodeGeneration.cmo: \ ++ ./src/modelica_compiler/symbolicExpression.cmi \ ++ ./src/modelica_compiler/optimization.cmi \ ++ src/modelica_compiler/xMLCodeGeneration.cmi ++src/modelica_compiler/xMLCodeGeneration.cmx: \ ++ ./src/modelica_compiler/symbolicExpression.cmx \ ++ ./src/modelica_compiler/optimization.cmx \ ++ src/modelica_compiler/xMLCodeGeneration.cmi ++src/modelica_compiler/optimizingCompiler.cmo: \ ++ ./src/modelica_compiler/xMLCodeGeneration.cmi \ ++ ./src/modelica_compiler/precompilation.cmi \ ++ ./src/translator/parsing/parser.cmi \ ++ ./src/modelica_compiler/optimization.cmi \ ++ ./src/translator/parsing/lexer.cmi \ ++ ./src/translator/instantiation/instantiation.cmi \ ++ ./src/modelica_compiler/compilation.cmi \ ++ src/modelica_compiler/optimizingCompiler.cmi ++src/modelica_compiler/optimizingCompiler.cmx: \ ++ ./src/modelica_compiler/xMLCodeGeneration.cmx \ ++ ./src/modelica_compiler/precompilation.cmx \ ++ ./src/translator/parsing/parser.cmx \ ++ ./src/modelica_compiler/optimization.cmx \ ++ ./src/translator/parsing/lexer.cmx \ ++ ./src/translator/instantiation/instantiation.cmx \ ++ ./src/modelica_compiler/compilation.cmx \ ++ src/modelica_compiler/optimizingCompiler.cmi ++src/modelica_compiler/scicosCodeGeneration.cmo: \ ++ ./src/modelica_compiler/symbolicExpression.cmi \ ++ ./src/modelica_compiler/optimization.cmi \ ++ ./src/translator/instantiation/instantiation.cmi \ ++ src/modelica_compiler/scicosCodeGeneration.cmi ++src/modelica_compiler/scicosCodeGeneration.cmx: \ ++ ./src/modelica_compiler/symbolicExpression.cmx \ ++ ./src/modelica_compiler/optimization.cmx \ ++ ./src/translator/instantiation/instantiation.cmx \ ++ src/modelica_compiler/scicosCodeGeneration.cmi ++src/modelica_compiler/scicosOptimizingCompiler.cmo: \ ++ ./src/modelica_compiler/scicosCodeGeneration.cmi \ ++ ./src/modelica_compiler/optimizingCompiler.cmi \ ++ src/modelica_compiler/scicosOptimizingCompiler.cmi ++src/modelica_compiler/scicosOptimizingCompiler.cmx: \ ++ ./src/modelica_compiler/scicosCodeGeneration.cmx \ ++ ./src/modelica_compiler/optimizingCompiler.cmx \ ++ src/modelica_compiler/scicosOptimizingCompiler.cmi ++src/xml2modelica/xMLTree.cmo: ++src/xml2modelica/xMLTree.cmx: ++src/xml2modelica/linenum.cmo: ++src/xml2modelica/linenum.cmx: ++src/xml2modelica/stringParser.cmo: ++src/xml2modelica/stringParser.cmx: ++src/xml2modelica/stringLexer.cmo: ./src/xml2modelica/stringParser.cmo ++src/xml2modelica/stringLexer.cmx: ./src/xml2modelica/stringParser.cmx ++src/xml2modelica/xMLParser.cmo: ./src/xml2modelica/xMLTree.cmo \ ++ ./src/translator/parsing/linenum.cmi ++src/xml2modelica/xMLParser.cmx: ./src/xml2modelica/xMLTree.cmx \ ++ ./src/translator/parsing/linenum.cmx ++src/xml2modelica/xMLLexer.cmo: ./src/xml2modelica/xMLParser.cmo ++src/xml2modelica/xMLLexer.cmx: ./src/xml2modelica/xMLParser.cmx ++src/xml2modelica/modelicaCodeGenerator.cmo: ./src/xml2modelica/xMLTree.cmo \ ++ ./src/xml2modelica/stringParser.cmo ./src/xml2modelica/stringLexer.cmo ++src/xml2modelica/modelicaCodeGenerator.cmx: ./src/xml2modelica/xMLTree.cmx \ ++ ./src/xml2modelica/stringParser.cmx ./src/xml2modelica/stringLexer.cmx ++src/xml2modelica/xML2Modelica.cmo: ./src/xml2modelica/xMLParser.cmo \ ++ ./src/xml2modelica/xMLLexer.cmo \ ++ ./src/xml2modelica/modelicaCodeGenerator.cmo ++src/xml2modelica/xML2Modelica.cmx: ./src/xml2modelica/xMLParser.cmx \ ++ ./src/xml2modelica/xMLLexer.cmx \ ++ ./src/xml2modelica/modelicaCodeGenerator.cmx ++src/translator/parsing/syntax.cmi: ++src/translator/parsing/parser.cmi: ./src/translator/parsing/syntax.cmi ++src/translator/parsing/lexer.cmi: ./src/translator/parsing/parser.cmi ++src/translator/parsing/linenum.cmi: ++src/translator/compilation/types.cmi: ++src/translator/compilation/nameResolve.cmi: \ ++ ./src/translator/compilation/types.cmi \ ++ ./src/translator/parsing/syntax.cmi ./src/translator/parsing/parser.cmi ++src/translator/instantiation/instantiation.cmi: \ ++ ./src/translator/compilation/types.cmi \ ++ ./src/translator/parsing/syntax.cmi ./src/translator/parsing/parser.cmi \ ++ ./src/translator/compilation/nameResolve.cmi ++src/translator/exceptionHandling/msgDico.cmi: ++src/translator/exceptionHandling/errorDico.cmi: \ ++ ./src/translator/parsing/parser.cmi \ ++ ./src/translator/instantiation/instantiation.cmi ++src/translator/exceptionHandling/exceptHandler.cmi: \ ++ ./src/translator/parsing/parser.cmi \ ++ ./src/translator/instantiation/instantiation.cmi ++src/translator/translation/libraryManager.cmi: \ ++ ./src/translator/parsing/syntax.cmi ./src/translator/parsing/parser.cmi ++src/translator/translation/codeGeneration.cmi: \ ++ ./src/translator/compilation/types.cmi \ ++ ./src/translator/instantiation/instantiation.cmi \ ++ ./src/translator/exceptionHandling/errorDico.cmi ++src/translator/translation/versiondate.cmi: ++src/translator/translation/translator.cmi: \ ++ ./src/translator/parsing/syntax.cmi \ ++ ./src/translator/compilation/nameResolve.cmi \ ++ ./src/translator/instantiation/instantiation.cmi ++src/translator/parsing/syntax.cmo: src/translator/parsing/syntax.cmi ++src/translator/parsing/syntax.cmx: src/translator/parsing/syntax.cmi ++src/translator/parsing/parser.cmo: ./src/translator/parsing/syntax.cmi \ ++ src/translator/parsing/parser.cmi ++src/translator/parsing/parser.cmx: ./src/translator/parsing/syntax.cmx \ ++ src/translator/parsing/parser.cmi ++src/translator/parsing/lexer.cmo: ./src/translator/parsing/parser.cmi \ ++ src/translator/parsing/lexer.cmi ++src/translator/parsing/lexer.cmx: ./src/translator/parsing/parser.cmx \ ++ src/translator/parsing/lexer.cmi ++src/translator/parsing/linenum.cmo: src/translator/parsing/linenum.cmi ++src/translator/parsing/linenum.cmx: src/translator/parsing/linenum.cmi ++src/translator/compilation/types.cmo: src/translator/compilation/types.cmi ++src/translator/compilation/types.cmx: src/translator/compilation/types.cmi ++src/translator/compilation/nameResolve.cmo: \ ++ ./src/translator/compilation/types.cmi \ ++ ./src/translator/parsing/syntax.cmi ./src/translator/parsing/parser.cmi \ ++ src/translator/compilation/nameResolve.cmi ++src/translator/compilation/nameResolve.cmx: \ ++ ./src/translator/compilation/types.cmx \ ++ ./src/translator/parsing/syntax.cmx ./src/translator/parsing/parser.cmx \ ++ src/translator/compilation/nameResolve.cmi ++src/translator/instantiation/instantiation.cmo: \ ++ ./src/translator/compilation/types.cmi \ ++ ./src/translator/parsing/syntax.cmi ./src/translator/parsing/parser.cmi \ ++ ./src/translator/compilation/nameResolve.cmi \ ++ src/translator/instantiation/instantiation.cmi ++src/translator/instantiation/instantiation.cmx: \ ++ ./src/translator/compilation/types.cmx \ ++ ./src/translator/parsing/syntax.cmx ./src/translator/parsing/parser.cmx \ ++ ./src/translator/compilation/nameResolve.cmx \ ++ src/translator/instantiation/instantiation.cmi ++src/translator/exceptionHandling/msgDico.cmo: \ ++ src/translator/exceptionHandling/msgDico.cmi ++src/translator/exceptionHandling/msgDico.cmx: \ ++ src/translator/exceptionHandling/msgDico.cmi ++src/translator/exceptionHandling/errorDico.cmo: \ ++ ./src/translator/parsing/parser.cmi \ ++ ./src/translator/compilation/nameResolve.cmi \ ++ ./src/translator/instantiation/instantiation.cmi \ ++ src/translator/exceptionHandling/errorDico.cmi ++src/translator/exceptionHandling/errorDico.cmx: \ ++ ./src/translator/parsing/parser.cmx \ ++ ./src/translator/compilation/nameResolve.cmx \ ++ ./src/translator/instantiation/instantiation.cmx \ ++ src/translator/exceptionHandling/errorDico.cmi ++src/translator/exceptionHandling/exceptHandler.cmo: \ ++ ./src/translator/parsing/parser.cmi \ ++ ./src/translator/compilation/nameResolve.cmi \ ++ ./src/translator/exceptionHandling/msgDico.cmi \ ++ ./src/translator/parsing/linenum.cmi \ ++ ./src/translator/instantiation/instantiation.cmi \ ++ ./src/translator/exceptionHandling/errorDico.cmi \ ++ src/translator/exceptionHandling/exceptHandler.cmi ++src/translator/exceptionHandling/exceptHandler.cmx: \ ++ ./src/translator/parsing/parser.cmx \ ++ ./src/translator/compilation/nameResolve.cmx \ ++ ./src/translator/exceptionHandling/msgDico.cmx \ ++ ./src/translator/parsing/linenum.cmx \ ++ ./src/translator/instantiation/instantiation.cmx \ ++ ./src/translator/exceptionHandling/errorDico.cmx \ ++ src/translator/exceptionHandling/exceptHandler.cmi ++src/translator/translation/libraryManager.cmo: \ ++ ./src/translator/parsing/parser.cmi ./src/translator/parsing/lexer.cmi \ ++ ./src/translator/exceptionHandling/exceptHandler.cmi \ ++ src/translator/translation/libraryManager.cmi ++src/translator/translation/libraryManager.cmx: \ ++ ./src/translator/parsing/parser.cmx ./src/translator/parsing/lexer.cmx \ ++ ./src/translator/exceptionHandling/exceptHandler.cmx \ ++ src/translator/translation/libraryManager.cmi ++src/translator/translation/codeGeneration.cmo: \ ++ ./src/translator/compilation/types.cmi \ ++ ./src/translator/compilation/nameResolve.cmi \ ++ ./src/translator/instantiation/instantiation.cmi \ ++ ./src/translator/exceptionHandling/errorDico.cmi \ ++ src/translator/translation/codeGeneration.cmi ++src/translator/translation/codeGeneration.cmx: \ ++ ./src/translator/compilation/types.cmx \ ++ ./src/translator/compilation/nameResolve.cmx \ ++ ./src/translator/instantiation/instantiation.cmx \ ++ ./src/translator/exceptionHandling/errorDico.cmx \ ++ src/translator/translation/codeGeneration.cmi ++src/translator/translation/versiondate.cmo: \ ++ src/translator/translation/versiondate.cmi ++src/translator/translation/versiondate.cmx: \ ++ src/translator/translation/versiondate.cmi ++src/translator/translation/translator.cmo: \ ++ ./src/translator/translation/versiondate.cmi \ ++ ./src/translator/compilation/nameResolve.cmi \ ++ ./src/translator/translation/libraryManager.cmi \ ++ ./src/translator/instantiation/instantiation.cmi \ ++ ./src/translator/exceptionHandling/exceptHandler.cmi \ ++ ./src/translator/translation/codeGeneration.cmi \ ++ src/translator/translation/translator.cmi ++src/translator/translation/translator.cmx: \ ++ ./src/translator/translation/versiondate.cmx \ ++ ./src/translator/compilation/nameResolve.cmx \ ++ ./src/translator/translation/libraryManager.cmx \ ++ ./src/translator/instantiation/instantiation.cmx \ ++ ./src/translator/exceptionHandling/exceptHandler.cmx \ ++ ./src/translator/translation/codeGeneration.cmx \ ++ src/translator/translation/translator.cmi diff --git a/source/xapps-extra/scilab/librarypath.patch b/source/xapps-extra/scilab/librarypath.patch new file mode 100644 index 0000000..d896468 --- /dev/null +++ b/source/xapps-extra/scilab/librarypath.patch @@ -0,0 +1,29 @@ +Index: scilab-5.5.2/bin/scilab +=================================================================== +--- scilab-5.5.2.orig/bin/scilab ++++ scilab-5.5.2/bin/scilab +@@ -785,7 +785,7 @@ SCILIB=$SCI/bin:$SCI/lib/scilab/:$SCI/li + if test -d $SCI/lib/thirdparty; then + SCILIB=$SCI/lib/thirdparty:$SCILIB; + fi +-LD_LIBRARY_PATH=$SCILIB${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH} ++#LD_LIBRARY_PATH=$SCILIB${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH} + + case $OS in + *darwin* | *Darwin*) # MacOS X +@@ -829,6 +829,7 @@ case $OS in + *) + esac + ++LD_LIBRARY_PATH=/usr/lib/scilab/:/usr/lib64/scilab/:.${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} + + if test $SCIVERBOSE -ne 0; then + echo "LD_LIBRARY_PATH : $LD_LIBRARY_PATH" +@@ -1101,6 +1102,7 @@ if test "$rest" = "yes"; then + esac + done + ++LD_LIBRARY_PATH=/usr/lib/scilab/:/usr/lib64/scilab/:.${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} + + # If the argument -a is not provided (extraarg) and we found unknown args + # fail and provide help _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
