diff mbox series

octave: upgrade 7.2.0 -> 11.3.0 + rework + pcre -> pcre2

Message ID 2e11d3a01b91643c580397d35fea87d270d66771.1781872021.git.joerg.sommer@navimatix.de
State New
Headers show
Series octave: upgrade 7.2.0 -> 11.3.0 + rework + pcre -> pcre2 | expand

Commit Message

Jörg Sommer June 19, 2026, 12:27 p.m. UTC 
From: Jörg Sommer <joerg.sommer@navimatix.de>

This new version works with pcre2. The other dependencies only got sorted.
Now, Octave provides xz compressed tarballs, which are much smaller.

Unfortunately, Octave generates source code files during the build with
multiple variables from the build environment which are end up in the
binaries.

Signed-off-by: Jörg Sommer <joerg.sommer@navimatix.de>
---
 .../files/fix-blas-library-integer-size.patch | 18 ------
 .../{octave_7.2.0.bb => octave_11.3.0.bb}     | 55 ++++++++++++-------
 2 files changed, 34 insertions(+), 39 deletions(-)
 delete mode 100644 meta-oe/recipes-devtools/octave/files/fix-blas-library-integer-size.patch
 rename meta-oe/recipes-devtools/octave/{octave_7.2.0.bb => octave_11.3.0.bb} (39%)
diff mbox series

Patch

diff --git a/meta-oe/recipes-devtools/octave/files/fix-blas-library-integer-size.patch b/meta-oe/recipes-devtools/octave/files/fix-blas-library-integer-size.patch
deleted file mode 100644
index 4189d4083a..0000000000
--- a/meta-oe/recipes-devtools/octave/files/fix-blas-library-integer-size.patch
+++ /dev/null
@@ -1,18 +0,0 @@ 
-Upstream-Status: Pending
-
-diff -Naur octave-4.4.1.orig/configure.ac octave-4.4.1/configure.ac
---- octave-4.4.1.orig/configure.ac	2019-02-23 10:46:24.287240571 +0000
-+++ octave-4.4.1/configure.ac	2019-02-23 10:46:42.255249333 +0000
-@@ -762,6 +762,12 @@
-   AC_MSG_ERROR([BLAS and LAPACK libraries are required])
- fi
- 
-+if ac_fn_f77_try_run "$LINENO"; then :
-+  ax_blas_integer_size=8
-+else
-+  ax_blas_integer_size=4
-+fi
-+
- case $ax_blas_integer_size in
-   4)
-     HAVE_64_BIT_BLAS=no
diff --git a/meta-oe/recipes-devtools/octave/octave_7.2.0.bb b/meta-oe/recipes-devtools/octave/octave_11.3.0.bb
similarity index 39%
rename from meta-oe/recipes-devtools/octave/octave_7.2.0.bb
rename to meta-oe/recipes-devtools/octave/octave_11.3.0.bb
index eb96a624f6..9f796e1f0f 100644
--- a/meta-oe/recipes-devtools/octave/octave_7.2.0.bb
+++ b/meta-oe/recipes-devtools/octave/octave_11.3.0.bb
@@ -1,5 +1,11 @@ 
 SUMMARY = "High-level language, primarily intended for numerical computations"
-HOMEPAGE = "http://www.gnu.org/software/octave/"
+DESCRIPTION = "\
+    GNU Octave is a scientific programming language with powerful \
+    mathematics-oriented syntax with built-in 2D/3D plotting and visualization \
+    tools, which is drop-in compatible with many Matlab scripts. \
+"
+HOMEPAGE = "https://octave.org/"
+BUGTRACKER = "https://bugs.octave.org/"
 SECTION = "math"
 
 LICENSE = "GPL-3.0-only"
@@ -8,45 +14,52 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464"
 # To build, add 'FORTRAN:forcevariable = ",fortran"' to your local.conf (or use
 # meta-mortsgna as distro :)
 
-DEPENDS = " \
-    gperf-native \
-    libglu \
-    lapack \
-    fftw \
+DEPENDS = "\
     curl \
-    freetype \
-    fontconfig \
-    texinfo \
-    pcre \
-    readline \
+    fftw \
     fltk \
+    fontconfig \
+    freetype \
+    gperf-native \
     hdf5 \
+    lapack \
+    libglu \
     libsndfile1 \
+    pcre2 \
+    readline \
+    texinfo \
 "
 
 inherit autotools pkgconfig texinfo gettext gtk-icon-cache mime-xdg features_check
 
+# File /usr/lib/octave/11.3.0/liboctinterp.so.15.0.1 in package octave contains reference to TMPDIR [buildpaths]
+#  contains the whole compiler invokation
+# File /usr/lib/octave/11.3.0/.debug/liboctave.so.13.0.2 in package octave-dbg contains reference to TMPDIR [buildpaths]
+#  contains all fortran compiler options
+# File /usr/src/debug/octave/11.3.0/libinterp/build-env.cc in package octave-src contains reference to TMPDIR [buildpaths]
+#  contains multiple variables from the build environment
+# File /usr/src/debug/octave/11.3.0/src/mkoctfile.cc in package octave-src contains reference to TMPDIR [buildpaths]
+#  contains the variables CC CFLAGS CXX and CXXFLAGS from the build environment
+INSANE_SKIP += "buildpaths"
+
 REQUIRED_DISTRO_FEATURES = "x11 opengl"
 
-SRC_URI = " \
-    ${GNU_MIRROR}/octave/${BPN}-${PV}.tar.gz \
-    file://fix-blas-library-integer-size.patch \
-"
-SRC_URI[sha256sum] = "b12cb652587d31c5c382b39ed73463c22a5259ecb2fa6b323a27da409222dacc"
+SRC_URI = "${GNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.xz"
+SRC_URI[sha256sum] = "2b80f3149b2de6d1f4f2fcb4fe6515a17eb363b52111bf57b90f37bf6f5e12e1"
 
 # Note: Qt5Help is required for gui -> qttools(-native) must be build with
 # clang in PACKAGECONFIG
-PACKAGECONFIG[gui] = "--with-qt=yes,--with-qt=no,qttools-native qttools qtbase"
+PACKAGECONFIG[gui] = "--with-qt,--without-qt,qttools-native qttools qtbase"
 
-EXTRA_OECONF = " \
+EXTRA_OECONF = "\
     --disable-java \
     --disable-docs \
 "
 
 do_compile:prepend() {
-	for folder in "liboctave/operators liboctave/numeric liboctave/array liboctave/util"; do
-		mkdir -p ${B}/${folder}
-	done
+    for folder in "liboctave/operators liboctave/numeric liboctave/array liboctave/util"; do
+        mkdir -p ${B}/${folder}
+    done
 }
 
 FILES:${PN} += "${datadir}/metainfo"