Mercurial > mxe-octave
changeset 6037:99125d7343bf release octave-rc-7.0.90
Update version numbers and build rules for Octave 7.0.90 release candidate.
* src/stable-octave.mk: Update version to 7.0.91.
* src/release-octave.mk: Update version to 7.0.90. Update checksum
for release candidate. Merge build rule changes from stable-octave.mk.
| author | Markus Mützel <markus.muetzel@gmx.de> |
|---|---|
| date | Thu, 06 Jan 2022 13:10:12 +0100 |
| parents | 9ccca4b29aa3 |
| children | 7f759a309b91 8fe63bf59527 |
| files | src/release-octave.mk src/stable-octave.mk |
| diffstat | 2 files changed, 29 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/release-octave.mk Thu Jan 06 12:59:14 2022 +0100 +++ b/src/release-octave.mk Thu Jan 06 13:10:12 2022 +0100 @@ -34,15 +34,15 @@ PKG := release-octave $(PKG)_IGNORE := -$(PKG)_VERSION := 6.4.0 -$(PKG)_CHECKSUM := d8a5577ddd81de987cd0812df38f8c897f34fa9f +$(PKG)_VERSION := 7.0.90 +$(PKG)_CHECKSUM := 067ca5a4d3c213247660aba97d4e6d6daade2426 $(PKG)_SUBDIR := octave-$($(PKG)_VERSION) $(PKG)_FILE := octave-$($(PKG)_VERSION).tar.lz -$(PKG)_URL := ftp://ftp.gnu.org/gnu/octave/$($(PKG)_FILE) +$(PKG)_URL := ftp://alpha.gnu.org/gnu/octave/$($(PKG)_FILE) ifeq ($(USE_SYSTEM_FONTCONFIG),no) $(PKG)_FONTCONFIG := fontconfig endif -$(PKG)_DEPS := blas arpack curl epstool fftw fltk $($(PKG)_FONTCONFIG) ghostscript gl2ps glpk gnuplot graphicsmagick hdf5 lapack libsndfile pcre portaudio pstoedit qhull qrupdate qscintilla readline sundials-ida suitesparse texinfo zlib +$(PKG)_DEPS := blas arpack curl epstool fftw fltk $($(PKG)_FONTCONFIG) ghostscript gl2ps glpk gnuplot graphicsmagick hdf5 lapack libsndfile pcre portaudio pstoedit qhull qrupdate qscintilla rapidjson readline sundials-ida suitesparse texinfo zlib ifeq ($(ENABLE_QT5),yes) $(PKG)_DEPS += qt5 @@ -138,6 +138,21 @@ $(PKG)_ENABLE_FORTRAN_INT64_CONFIGURE_OPTIONS := ax_blas_f77_func_ok=yes ax_blas_integer_size=4 octave_cv_sizeof_fortran_integer=4 endif +ifeq ($(MXE_SYSTEM),mingw) + # This is very similar to CONFIGURE_CPPFLAGS and CONFIGURE_LDFLAGS but with + # double quoted paths. + $(PKG)_CONFIGURE_CPPFLAGS := CPPFLAGS='-I"$(HOST_PREFIX)/include"' + ifeq ($(MXE_USE_LIB64_DIRECTORY),yes) + $(PKG)_CONFIGURE_LDFLAGS := LDFLAGS='-L"$(HOST_PREFIX)/lib" -L"$(HOST_PREFIX)/lib64"' + else + $(PKG)_CONFIGURE_LDFLAGS := LDFLAGS='-L"$(HOST_PREFIX)/lib"' + endif +else + $(PKG)_CONFIGURE_CPPFLAGS := $(CONFIGURE_CPPFLAGS) + $(PKG)_CONFIGURE_LDFLAGS := $(CONFIGURE_LDFLAGS) +endif + + ifeq ($(MXE_SYSTEM),msvc) $(PKG)_PREFIX := '$(HOST_PREFIX)/local/$($(PKG)_SUBDIR)' # - Enable atomic refcount (required for QtHandles) @@ -152,8 +167,13 @@ CXXFLAGS='-O2 -wd4244 -wd4003 -wd4005 -wd4068' else $(PKG)_PREFIX := '$(HOST_PREFIX)' - $(PKG)_EXTRA_CONFIGURE_OPTIONS := \ - LDFLAGS='-Wl,-rpath-link,$(HOST_LIBDIR) -L$(HOST_LIBDIR) -L$($(PKG)_QTDIR)/lib' + ifeq ($(MXE_SYSTEM),mingw) + $(PKG)_EXTRA_CONFIGURE_OPTIONS := \ + LDFLAGS='-Wl,-rpath-link,"$(HOST_LIBDIR)" -L"$(HOST_LIBDIR)" -L"$($(PKG)_QTDIR)/lib"' + else + $(PKG)_EXTRA_CONFIGURE_OPTIONS := \ + LDFLAGS='-Wl,-rpath-link,$(HOST_LIBDIR) -L$(HOST_LIBDIR) -L$($(PKG)_QTDIR)/lib' + endif endif ifeq ($(MXE_SYSTEM),mingw) @@ -195,7 +215,8 @@ mkdir '$(1)/.build' cd '$(1)/.build' && $($(PKG)_CONFIGURE_ENV) '$(1)/configure' \ - $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ + $($(PKG)_CONFIGURE_CPPFLAGS) \ + $($(PKG)_CONFIGURE_LDFLAGS) \ $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$($(PKG)_PREFIX)' \ --disable-silent-rules \
--- a/src/stable-octave.mk Thu Jan 06 12:59:14 2022 +0100 +++ b/src/stable-octave.mk Thu Jan 06 13:10:12 2022 +0100 @@ -13,7 +13,7 @@ PKG := stable-octave $(PKG)_IGNORE := -$(PKG)_VERSION := 7.0.1 +$(PKG)_VERSION := 7.0.91 $(PKG)_CHECKSUM := ## No checksum $(PKG)_SUBDIR := octave-$($(PKG)_VERSION) $(PKG)_FILE := octave-$($(PKG)_VERSION).tar.lz