Fix WANTLIB and set --without-fltk

- Bring back WANTLIB, I accidentally deleted it.
- Stop picking up fltk if present at configure time

OK naddy sthen
This commit is contained in:
rsadowski 2020-05-05 18:41:56 +00:00
parent 327b7d88ce
commit 0f846c4a53

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.118 2020/04/05 15:44:52 naddy Exp $
# $OpenBSD: Makefile,v 1.119 2020/05/05 18:41:56 rsadowski Exp $
COMMENT = high-level language for numerical computations
VERSION = 5.1.0
DISTNAME = octave-${VERSION}
CATEGORIES = math
REVISION = 4
REVISION = 5
SHARED_LIBS += octave 12.0
SHARED_LIBS += octgui 6.0
@ -18,6 +18,20 @@ MAINTAINER = Steven Mestdagh <steven@openbsd.org>
# GPLv3
PERMIT_PACKAGE = Yes
WANTLIB += ${COMPILER_LIBCXX} FLAC GL GLU GraphicsMagick GraphicsMagick++
WANTLIB += ICE Qt5Core Qt5Gui Qt5Help Qt5Network Qt5OpenGL Qt5PrintSupport
WANTLIB += Qt5Sql Qt5Widgets Qt5Xml SM X11 X11-xcb Xdamage Xext
WANTLIB += Xfixes Xi Xmu Xrandr Xrender Xt Xxf86vm amd arpack
WANTLIB += blas btf bz2 c camd ccolamd cholmod colamd crypto curl
WANTLIB += curses cxsparse double-conversion drm ereadline execinfo
WANTLIB += expat fftw3 fftw3_threads fftw3f fftw3f_threads fontconfig
WANTLIB += freetype gl2ps glapi glib-2.0 glpk glut gmp graphite2
WANTLIB += gthread-2.0 harfbuzz hdf5 iconv icudata icui18n icuio
WANTLIB += icuuc intl klu lapack lcms2 ltdl lzma m nghttp2 ogg
WANTLIB += pcre pcre2-16 png portaudio qhull qrupdate qscintilla2_qt5
WANTLIB += sndfile sndio ssl suitesparseconfig umfpack util vorbis
WANTLIB += vorbisenc xcb xcb-dri2 xcb-dri3 xcb-glx xcb-present
WANTLIB += xcb-sync xcb-xfixes xshmfence z zstd
MASTER_SITES = ${MASTER_SITE_GNU:=octave/}
@ -61,6 +75,7 @@ USE_GMAKE = Yes
CONFIGURE_STYLE = gnu
# --disable-readline: needs GNU readline
CONFIGURE_ARGS = --disable-java \
--without-fltk \
octave_cv_version_2_6_0=yes
CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include \
-I${LOCALBASE}/include/ereadline" \