Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] octave: update to 6.2.0. #27775

Merged
merged 1 commit into from
Aug 11, 2021
Merged

Conversation

olafmersmann
Copy link
Contributor

No description provided.

@ericonr
Copy link
Member

ericonr commented Feb 15, 2021

Error from test suite:

   GEN      doc/interpreter/octave_interpreter.qhc
QStandardPaths: XDG_RUNTIME_DIR not set, defaulting to '/tmp/runtime-root'
QSqlDatabase: QSQLITE driver not loaded
QSqlDatabase: available drivers: 
Cannot open data base file /builddir/octave-6.1.0/doc/interpreter/octave_interpreter.qch.

@ericonr
Copy link
Member

ericonr commented Feb 15, 2021

I don't know if we need all of them passing cleanly, octave is rather big and complicated.

# on all others.
case "$XBPS_TARGET_MACHINE" in
# List of supported architectures copied from openblas.
armv[67]*|aarch64*|i686*|x86_64*|ppc64*)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why add this list now?after taking a look at openblas/template, openblas is available for ppc and armv5 as well and they aren't listed (meaning: all archs Void provides binary packages for have openblas available).
you might as well be better off just marking mips*) to use regular blas to match this, as done in openblas/template.

may i ask which arch you had in mind in specific which caused any trouble here?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

openblas has:

case "${XBPS_TARGET_MACHINE}" in
	armv5*) make_build_args+=" TARGET=ARMV5" ;;
	armv6*) make_build_args+=" TARGET=ARMV6" ;;
	armv7*) make_build_args+=" TARGET=ARMV7" ;;
	aarch64*) make_build_args+=" TARGET=ARMV8 DYNAMIC_ARCH=1" ;;
	i686*) make_build_args+=" BINARY=32 TARGET=GENERIC DYNAMIC_ARCH=1" ;;
	x86_64*) make_build_args+=" BINARY=64 TARGET=GENERIC DYNAMIC_ARCH=1" ;;
	ppc64le*) make_build_args+=" TARGET=POWER8 DYNAMIC_ARCH=1" ;;
	ppc64*) make_build_args+=" TARGET=PPC970MP" ;; # dynamic arch broken for <power6
	ppc*) make_build_args+=" TARGET=PPCG4" ;;
	mips*) broken="Not supported" ;;
	*) broken="Add your CPU" ;;
esac

which would mean that eventual riscv target would be broken by default, for example, and would block octave from being built instead of building it with lapack. I think listing where it's known to work is a bit more correct.

makedepends="pcre-devel openblas-devel readline-devel libSM-devel libltdl-devel
lcms2-devel glpk-devel"
depends="$(vopt_if gui qt5-plugin-sqlite) texinfo"
depends="$(vopt_if gui qt5-plugin-sqlite) texinfo texlive-dvi tar"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what for is the runtime dependency on tar? I'm inclined to not add it to depends as tar is part of base-system already (no other package explicitly depends on tar, though many might need it)

Copy link
Member

@ericonr ericonr Mar 30, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Assuming it's necessary only for building packages, I don't think it's necessary to have it in depends. You still need gcc-fortran and other dependencies to build them.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry for dropping the ball on this. I'm currently too busy to work further on this. Anyone else feel free to pick up where I left off.

@Piraty
Copy link
Member

Piraty commented Mar 28, 2021

ping @diogoleal

@Piraty Piraty changed the title [WIP] octave: update to 6.1.0. [WIP] octave: update to 6.2.0. Mar 30, 2021
- add support for targets without proper openblas support
- add changelog for the 6.x release series
- fix gui deps
- adding 'texlive-dvi' and 'tar' to depends to make building external
  packages easier was considered, but ultimately dismissed; since they
  aren't enough to actually build packages, they would increase
  dependency count for little gain

Co-authored-by: Érico Nogueira <erico.erc@gmail.com>
@ericonr ericonr merged commit 79f2211 into void-linux:master Aug 11, 2021
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Nov 9, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants