Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (3aa472a9c8ece0875969af3db5f82bd9c5d85044)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (3aa472a9c8ece0875969af3db5f82bd9c5d85044)
  • Date: Thu, 10 Jan 2019 17:59:25 +0000

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

cluster/lapack/BUILD | 2 +-
cluster/lapack/DETAILS | 1 +
cluster/lapack/HISTORY | 4 ++++
science/octave/BUILD | 5 ++++-
science/octave/DEPENDS | 7 +++++++
science/octave/HISTORY | 2 ++
science/octave/PRE_BUILD | 7 +++++++
7 files changed, 26 insertions(+), 2 deletions(-)

New commits:
commit 3aa472a9c8ece0875969af3db5f82bd9c5d85044
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

lapack: build deprecated routines

commit 230b514cdd9c976cfaf8b74df308512b9fa00d94
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

octave: enable Qt5 GUI

diff --git a/cluster/lapack/BUILD b/cluster/lapack/BUILD
index 97022a5..43310a3 100755
--- a/cluster/lapack/BUILD
+++ b/cluster/lapack/BUILD
@@ -1,2 +1,2 @@
-OPTS+=" -DBUILD_SHARED_LIBS=on -DLAPACKE=on -DLAPACKE_WITH_TMG=on" &&
+OPTS+="-DBUILD_DEPRECATED=on -DBUILD_SHARED_LIBS=on -DLAPACKE=on
-DLAPACKE_WITH_TMG=on" &&
cmake_build
diff --git a/cluster/lapack/DETAILS b/cluster/lapack/DETAILS
index 5dd0357..8821327 100755
--- a/cluster/lapack/DETAILS
+++ b/cluster/lapack/DETAILS
@@ -13,6 +13,7 @@ SOURCE2_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION/man
WEB_SITE=http://www.netlib.org/lapack
KEYWORDS="fortran algebra cluster"
ENTERED=20020519
+ PATCHLEVEL=1
SHORT="Linear Algebra PACKage (Fortran version)"
cat << EOF
LAPACK provides routines for solving systems of simultaneous
diff --git a/cluster/lapack/HISTORY b/cluster/lapack/HISTORY
index 08eb394..e1fbb79 100644
--- a/cluster/lapack/HISTORY
+++ b/cluster/lapack/HISTORY
@@ -1,3 +1,7 @@
+2019-01-10 Thomas Orgis <sobukus AT sourcemage.org>
+ * BUILD: include deprecated functions (needed by octave control
package)
+ * DETAILS: PATCHLEVEL++
+
2017-11-18 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 3.8.0

diff --git a/science/octave/BUILD b/science/octave/BUILD
index 284371f..a6326f6 100755
--- a/science/octave/BUILD
+++ b/science/octave/BUILD
@@ -1,3 +1,6 @@
+if is_depends_enabled $SPELL qtbase; then
+ PATH+=":$QT5DIR/bin"
+ PKG_CONFIG_PATH+=":$QT5DIR/lib/pkgconfig"
+fi &&
export CXXFLAGS="$CXXFLAGS -pthread" &&
-export OPTS="$OPTS --disable-rpath --enable-shared --enable-dl" &&
FFLAGS=$CFLAGS default_build
diff --git a/science/octave/DEPENDS b/science/octave/DEPENDS
index 5d61f02..8c3f04a 100755
--- a/science/octave/DEPENDS
+++ b/science/octave/DEPENDS
@@ -2,6 +2,13 @@ depends -sub FORTRAN gcc &&
depends lapack &&
depends pcre &&

+# I want optional_depends "qtbase qttools" ...
+optional_depends qtbase "" "--without-qt" "for Qt GUI" &&
+if is_depends_enabled $SPELL qtbase; then
+ depends qttools &&
+ optional_depends qscintilla "" "--without-qscintilla" "for GUI Editor"
+fi &&
+
optional_depends gnuplot \
'' \
'' \
diff --git a/science/octave/HISTORY b/science/octave/HISTORY
index 9e3ec1b..7b79738 100644
--- a/science/octave/HISTORY
+++ b/science/octave/HISTORY
@@ -1,5 +1,7 @@
2019-01-10 Thomas Orgis <sobukus AT sourcemage.org>
* DEPENDS: -sub OPENGL fltk (fails linking otherwise)
+ * DEPENDS, BUILD: Qt GUI, no rpath/shared lib messing
+ * PRE_BUILD: fix qscintilla detection for our layout

2018-12-31 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: hot-update to 4.4.1, fixup needed for deps
diff --git a/science/octave/PRE_BUILD b/science/octave/PRE_BUILD
new file mode 100755
index 0000000..10be498
--- /dev/null
+++ b/science/octave/PRE_BUILD
@@ -0,0 +1,7 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+# Octave expects some qt5-specific name for the lib, while we install it in a
+# specific prefix.
+sed -i \
+ 's:octave_qscintilla_libnames="qscintilla2-qt5 qscintilla2_qt5
qt5scintilla2":octave_qscintilla_libnames=qscintilla2:' \
+ configure



  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (3aa472a9c8ece0875969af3db5f82bd9c5d85044), Thomas Orgis, 01/10/2019

Archive powered by MHonArc 2.6.24.

Top of Page