# HG changeset patch # User John W. Eaton # Date 1530033771 14400 # Node ID 9942a9c37ffea6af253d0f7bc369ad4b66f55f8e # Parent 508a600b3b8e368ac6788f1a9ea3b1aaa1fce246 remove octave 'alpha' package * octave-1-gnulib.patch, octave.mk: Delete. * dist-files.mk: Update. * index.html: Delete entry for octave. * configure.ac: Don't handle 'alpha' in --enable-octave=VERSION option. (AC_CONFIG_SRCDIR): Look for src/default-octave.mk instead of src/octave.mk. diff -r 508a600b3b8e -r 9942a9c37ffe configure.ac --- a/configure.ac Tue Jun 26 09:38:55 2018 -0400 +++ b/configure.ac Tue Jun 26 13:22:51 2018 -0400 @@ -3,7 +3,7 @@ AC_PREREQ([2.62]) AC_INIT([MXE-Octave], [0.0.35], [https://octave.org/bugs.html], [mxe-octave]) -AC_CONFIG_SRCDIR([src/octave.mk]) +AC_CONFIG_SRCDIR([src/default-octave.mk]) AC_CONFIG_AUX_DIR([tools]) ### Check for bootstrap tools. This list is probably not complete yet. @@ -269,10 +269,9 @@ AC_ARG_ENABLE([octave], [AS_HELP_STRING([--enable-octave=stable], - [Enable a specific build of Octave (stable, alpha, default)])], + [Enable a specific build of Octave (stable, default)])], [case $enableval in stable) ENABLE_OCTAVE="stable-" ;; - alpha) ENABLE_OCTAVE="" ;; default) ENABLE_OCTAVE="default-" ;; *) AC_MSG_ERROR([bad value "$enableval" for --enable-octave]) ;; esac], [ENABLE_OCTAVE="stable-"]) diff -r 508a600b3b8e -r 9942a9c37ffe dist-files.mk --- a/dist-files.mk Tue Jun 26 09:38:55 2018 -0400 +++ b/dist-files.mk Tue Jun 26 13:22:51 2018 -0400 @@ -451,8 +451,6 @@ ocaml-flexdll.mk \ ocaml-native-1-fixes.patch \ ocaml-native.mk \ - octave-1-gnulib.patch \ - octave.mk \ of-actuarial.mk \ of-communications-1-fixes.patch \ of-communications-2-fixes.patch \ diff -r 508a600b3b8e -r 9942a9c37ffe index.html --- a/index.html Tue Jun 26 09:38:55 2018 -0400 +++ b/index.html Tue Jun 26 13:22:51 2018 -0400 @@ -1922,10 +1922,6 @@ ocaml - octave - Octave - - of-actuarial Octave Forge actuarial package diff -r 508a600b3b8e -r 9942a9c37ffe src/octave-1-gnulib.patch --- a/src/octave-1-gnulib.patch Tue Jun 26 09:38:55 2018 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ -diff -uNr a/libgnu/unistd.in.h b/libgnu/unistd.in.h ---- a/libgnu/unistd.in.h 2016-06-18 18:47:32.000000000 -0400 -+++ b/libgnu/unistd.in.h 2016-06-23 18:45:42.410781867 -0400 -@@ -734,7 +734,7 @@ - Null terminate it if the name is shorter than LEN. - If the host name is longer than LEN, set errno = EINVAL and return -1. - Return 0 if successful, otherwise set errno and return -1. */ --# if @UNISTD_H_HAVE_WINSOCK2_H@ -+# if !@HAVE_GETHOSTNAME@ && @UNISTD_H_HAVE_WINSOCK2_H@ - # if !(defined __cplusplus && defined GNULIB_NAMESPACE) - # undef gethostname - # define gethostname rpl_gethostname diff -r 508a600b3b8e -r 9942a9c37ffe src/octave.mk --- a/src/octave.mk Tue Jun 26 09:38:55 2018 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,185 +0,0 @@ -# This file is part of MXE. -# See index.html for further information. - -PKG := octave -$(PKG)_IGNORE := -$(PKG)_VERSION := 4.2.0-rc4 -$(PKG)_CHECKSUM := a96a143a2f49306b259535454389d16393853fc4 -$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) -$(PKG)_FILE := octave-$($(PKG)_VERSION).tar.lz -$(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 mesa pcre portaudio pstoedit qhull qrupdate qscintilla readline suitesparse texinfo zlib - -ifeq ($(ENABLE_QT5),yes) - $(PKG)_DEPS += qt5 -else - $(PKG)_DEPS += qt -endif - -ifeq ($(MXE_WINDOWS_BUILD),no) - ifeq ($(USE_SYSTEM_X11_LIBS),no) - $(PKG)_DEPS += x11 xext - endif -endif -ifeq ($(MXE_SYSTEM),mingw) - ifeq ($(USE_SYSTEM_GCC),no) - $(PKG)_DEPS += libgomp - endif -endif -ifeq ($(ENABLE_JIT),yes) - $(PKG)_DEPS += llvm - $(PKG)_ENABLE_JIT_CONFIGURE_OPTIONS := --enable-jit -else - $(PKG)_ENABLE_JIT_CONFIGURE_OPTIONS := --disable-jit -endif - -ifeq ($(ENABLE_JAVA),no) - $(PKG)_ENABLE_JAVA_CONFIGURE_OPTIONS := --disable-java -else - ifeq ($(MXE_SYSTEM),mingw) - ifeq ($(MXE_NATIVE_BUILD),no) - $(PKG)_ENABLE_JAVA_CONFIGURE_OPTIONS := \ - --with-java-includedir="$(HOST_INCDIR)/java" - endif - endif -endif - -## If we allow the system Qt libraries to be used, then these -## won't make sense. -$(PKG)_QT_CONFIGURE_OPTIONS := \ - MOC=$(MXE_MOC) \ - UIC=$(MXE_UIC) \ - RCC=$(MXE_RCC) \ - LRELEASE=$(MXE_LRELEASE) - -ifeq ($(ENABLE_QT5),yes) - #$(PKG)_PKG_CONFIG_PATH := "$(HOST_LIBDIR)/pkgconfig" - $(PKG)_PKG_CONFIG_PATH := "$(HOST_PREFIX)/qt5/lib/pkgconfig:$(HOST_LIBDIR)/pkgconfig" - $(PKG)_QTDIR := $(HOST_PREFIX)/qt5 -else - $(PKG)_PKG_CONFIG_PATH := "$(HOST_LIBDIR)/pkgconfig" - $(PKG)_QTDIR := $(HOST_PREFIX) -endif - -ifneq ($(ENABLE_DOCS),yes) - $(PKG)_ENABLE_DOCS_CONFIGURE_OPTIONS := --disable-docs -endif - -ifeq ($(MXE_NATIVE_BUILD),yes) - $(PKG)_CONFIGURE_ENV := LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) - ifeq ($(ENABLE_64),yes) - $(PKG)_ENABLE_64_CONFIGURE_OPTIONS := --enable-64 F77_INTEGER_8_FLAG=-fdefault-integer-8 - endif -else - ifeq ($(MXE_SYSTEM),mingw) - $(PKG)_CROSS_CONFIG_OPTIONS := \ - FLTK_CONFIG='$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)fltk-config' \ - gl_cv_func_gettimeofday_clobber=no \ - gl_cv_func_tzset_clobber=no - ifeq ($(ENABLE_64),yes) - $(PKG)_ENABLE_64_CONFIGURE_OPTIONS := --enable-64 F77_INTEGER_8_FLAG=-fdefault-integer-8 ax_blas_f77_func_ok=yes - endif - endif -endif - -ifeq ($(MXE_SYSTEM),msvc) - $(PKG)_PREFIX := '$(HOST_PREFIX)/local/$($(PKG)_SUBDIR)' - # - Enable atomic refcount (required for QtHandles) - # - Skip configure test for pow and sqrt, MSVC fails to compile them - # because it uses intrinsics (with -O2 flag) and bump on the fake - # "char FUNC()" forward declaration. - # - Override CFLAGS and CXXFLAGS to disable some warnings. - $(PKG)_EXTRA_CONFIGURE_OPTIONS := \ - --enable-atomic-refcount \ - ac_cv_func_pow=yes ac_cv_func_sqrt=yes \ - CFLAGS='-O2 -wd4244 -wd4003 -wd4005 -wd4068' \ - 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' -endif - -ifeq ($(MXE_SYSTEM),mingw) - $(PKG)_EXTRA_CONFIGURE_OPTIONS += --with-x=no -endif - -ifeq ($(MXE_NATIVE_MINGW_BUILD),yes) - $(PKG)_EXTRA_CONFIGURE_OPTIONS += ac_cv_search_tputs=-ltermcap -endif - -# if want binary packages and are cross compiling, then we need cross tools enabled -ifeq ($(ENABLE_BINARY_PACKAGES),yes) - ifeq ($(MXE_NATIVE_BUILD),no) - $(PKG)_EXTRA_CONFIGURE_OPTIONS += --enable-cross-tools - endif -endif - -define $(PKG)_UPDATE - echo 'Warning: Updates are temporarily disabled for package octave.' >&2; - echo $($(PKG)_VERSION) -endef - -define $(PKG)_BUILD - # jni install - if [ "$(MXE_SYSTEM)" == "mingw" ] \ - && [ "$(MXE_NATIVE_BUILD)" == "no" ] \ - && [ "$(ENABLE_JAVA)" == "yes" ]; then \ - if [ ! -f $(HOST_INCDIR)/java/jni.h ]; then \ - mkdir -p '$(HOST_INCDIR)/java'; \ - $(WGET) -N http://hg.openjdk.java.net/jdk7u/jdk7u/jdk/raw-file/tip/src/share/javavm/export/jni.h \ - -O $(HOST_INCDIR)/java/jni.h; \ - fi; \ - if [ ! -f $(HOST_INCDIR)/java/win32/jni_md.h ]; then \ - mkdir -p '$(HOST_INCDIR)/java/win32'; \ - $(WGET) -N http://hg.openjdk.java.net/jdk7u/jdk7u/jdk/raw-file/tip/src/windows/javavm/export/jni_md.h \ - -O $(HOST_INCDIR)/java/win32/jni_md.h; \ - fi; \ - fi - - mkdir '$(1)/.build' - cd '$(1)/.build' && $($(PKG)_CONFIGURE_ENV) '$(1)/configure' \ - $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ - $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ - --prefix='$($(PKG)_PREFIX)' \ - --disable-silent-rules \ - --enable-install-build-logs \ - $($(PKG)_CROSS_CONFIG_OPTIONS) \ - $($(PKG)_ENABLE_64_CONFIGURE_OPTIONS) \ - $($(PKG)_ENABLE_JAVA_CONFIGURE_OPTIONS) \ - $($(PKG)_ENABLE_JIT_CONFIGURE_OPTIONS) \ - $($(PKG)_ENABLE_DOCS_CONFIGURE_OPTIONS) \ - $($(PKG)_QT_CONFIGURE_OPTIONS) \ - $($(PKG)_EXTRA_CONFIGURE_OPTIONS) \ - PKG_CONFIG='$(MXE_PKG_CONFIG)' \ - PKG_CONFIG_PATH=$($(PKG)_PKG_CONFIG_PATH) \ - && $(CONFIGURE_POST_HOOK) - - ## We want both of these install steps so that we install in the - ## location set by the configure --prefix option, and the other - ## in a directory tree that will have just Octave files. - $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install DESTDIR='$(3)' - - if [ "x$(MXE_SYSTEM)" == "xmingw" ]; then \ - cp '$(1)/.build/src/.libs/octave-gui.exe' '$(3)$(HOST_BINDIR)'; \ - if [ "x$(ENABLE_BINARY_PACKAGES)" == "xyes" ]; then \ - mkdir -p '$(3)$(BUILD_TOOLS_PREFIX)/bin'; \ - $(INSTALL) '$(1)/.build/src/$(MXE_TOOL_PREFIX)mkoctfile' '$(3)$(BUILD_TOOLS_PREFIX)/bin'; \ - $(INSTALL) '$(1)/.build/src/$(MXE_TOOL_PREFIX)octave-config' '$(3)$(BUILD_TOOLS_PREFIX)/bin'; \ - fi; \ - fi - - if [ "x$(ENABLE_DOCS)" == "xyes" ]; then \ - $(MAKE) -C '$(1)/.build' -j '$(JOBS)' DESTDIR=$(3) install-pdf install-html; \ - fi - - if [ $(MXE_SYSTEM) != msvc ]; then \ - $(MAKE) -C '$(1)/.build' -j '$(JOBS)' DESTDIR=$(TOP_BUILD_DIR)/octave install; \ - fi - - # create a file with latest installed octave rev in it - echo "$($(PKG)_VERSION)" > $(TOP_BUILD_DIR)/octave/octave-version -endef