diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:28:33 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:31:28 +0300 |
commit | 193236933b0f4ab91b1625b64e2187e2db4e0e8f (patch) | |
tree | e12769d7c76d8b0517d6de3d3c72189753d253ed /meta-openembedded/meta-oe/recipes-devtools/octave | |
parent | bd93df9478f2f56ffcbc8cb88f1709c735dcd85b (diff) | |
download | openbmc-193236933b0f4ab91b1625b64e2187e2db4e0e8f.tar.xz |
reset upstream subtrees to HEAD
Reset the following subtrees on HEAD:
poky: 8217b477a1(master)
meta-xilinx: 64aa3d35ae(master)
meta-openembedded: 0435c9e193(master)
meta-raspberrypi: 490a4441ac(master)
meta-security: cb6d1c85ee(master)
Squashed patches:
meta-phosphor: drop systemd 239 patches
meta-phosphor: mrw-api: use correct install path
Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-devtools/octave')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-devtools/octave/files/fix-blas-library-integer-size.patch | 16 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-devtools/octave/octave_4.4.1.bb | 40 |
2 files changed, 56 insertions, 0 deletions
diff --git a/meta-openembedded/meta-oe/recipes-devtools/octave/files/fix-blas-library-integer-size.patch b/meta-openembedded/meta-oe/recipes-devtools/octave/files/fix-blas-library-integer-size.patch new file mode 100644 index 0000000000..e89d7d3466 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/octave/files/fix-blas-library-integer-size.patch @@ -0,0 +1,16 @@ +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-openembedded/meta-oe/recipes-devtools/octave/octave_4.4.1.bb b/meta-openembedded/meta-oe/recipes-devtools/octave/octave_4.4.1.bb new file mode 100644 index 0000000000..1ec32ce89a --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/octave/octave_4.4.1.bb @@ -0,0 +1,40 @@ +DESCRIPTION = "High-level language, primarily intended for numerical computations" +HOMEPAGE = "http://www.gnu.org/software/octave/" +SECTION = "math" + +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" + +DEPENDS = "gperf-native texinfo lapack pcre readline" + +inherit autotools pkgconfig texinfo gettext + +EXTRA_OECONF = "--disable-java --disable-docs" + +SRC_URI = "https://ftp.gnu.org/gnu/octave/${PN}-${PV}.tar.gz \ + file://fix-blas-library-integer-size.patch \ +" + +SRC_URI[md5sum] = "b43bd5f4309a0c048c91af10cf8e8674" +SRC_URI[sha256sum] = "09fbd0f212f4ef21e53f1d9c41cf30ce3d7f9450fb44911601e21ed64c67ae97" + +do_compile_prepend() { + for folder in "liboctave/operators liboctave/numeric liboctave/array liboctave/util"; do + mkdir -p ${B}/${folder} + done +} + +PACKAGES =+ " octave-common liboctave liboctave-dev liboctave-dbg" + +FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${datadir}/${PN} \ + ${libdir}/${PN}/${PV}/oct ${libdir}/${PN}/${PV}/site \ + ${libdir}/${PN}/site ${datadir}/applications ${datadir}/metainfo" +FILES_${PN}-common = "${datadir}/icons" + +FILES_liboctave = "${libdir}/${PN}/${PV}/lib*${SOLIBS}" +FILES_liboctave-dev = "${libdir}/${PN}/${PV}/lib*${SOLIBSDEV}" +FILES_liboctave-dbg = "${libdir}/${PN}/${PV}/.debug" + +FILES_${PN}-dbg = "${bindir}/.debug ${libdir}/${PN}/${PV}/oct/${TARGET_SYS}/.debug" + +EXCLUDE_FROM_WORLD = "1" |