# HG changeset patch # User John D # Date 1484227013 18000 # Node ID caa35339a35416246ce19eb80bfeb7e64eb24d03 # Parent 33045d291c2bf5a6c704466dd554413dc15c0509 of-interval: update to v2.1.0 * build_packages.m: update interval version * src/of-interval.mk: update version, checksum, assign options if cross build * src/of-interval-1-cross-fixes.patch: new file * dist-files.mk: added of-interval-1-cross-fixes.patch diff -r 33045d291c2b -r caa35339a354 build_packages.m --- a/build_packages.m Wed Jan 11 16:12:38 2017 -0500 +++ b/build_packages.m Thu Jan 12 08:16:53 2017 -0500 @@ -65,7 +65,7 @@ try_install nurbs-1.3.10.tar.gz try_install strings-1.2.0.tar.gz try_install ga-0.10.0.tar.gz - try_install interval-2.0.0.tar.gz + try_install interval-2.1.0.tar.gz try_install nan-3.1.1.tar.gz try_install ocs-0.1.5.tar.gz try_install mapping-1.2.1.tar.gz diff -r 33045d291c2b -r caa35339a354 dist-files.mk --- a/dist-files.mk Wed Jan 11 16:12:38 2017 -0500 +++ b/dist-files.mk Thu Jan 12 08:16:53 2017 -0500 @@ -462,6 +462,7 @@ of-geometry.mk \ of-gsl.mk \ of-image.mk \ + of-interval-1-cross-fixes.patch \ of-interval.mk \ of-instrument-control.mk \ of-io-1-fixes.patch \ diff -r 33045d291c2b -r caa35339a354 src/of-interval-1-cross-fixes.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/of-interval-1-cross-fixes.patch Thu Jan 12 08:16:53 2017 -0500 @@ -0,0 +1,21 @@ +diff -ur interval-2.1.0.orig/src/Makefile interval-2.1.0/src/Makefile +--- interval-2.1.0.orig/src/Makefile 2017-01-12 07:52:23.327056830 -0500 ++++ interval-2.1.0/src/Makefile 2017-01-12 07:54:54.896233652 -0500 +@@ -18,6 +18,8 @@ + ## Use important flags in XTRA_CFLAGS for OpenMP (workaround for bug #45280) + CFLAG_OPENMP =$(findstring -fopenmp,$(shell $(MKOCTFILE) -p XTRA_CFLAGS)) + ++CRLIBM_CONFIG_FLAGS ?= ++ + all: $(OBJ) + + ## crlibm api oct-file +@@ -37,7 +39,7 @@ + crlibm/crlibm_private.o: crlibm/crlibm_config.h + $(MAKE) -C crlibm CFLAGS+="$(shell $(MKOCTFILE) -p CPICFLAG) -Wno-div-by-zero -Wno-unused-variable -Wno-unused-but-set-variable" + crlibm/crlibm_config.h: +- (cd crlibm && ./configure --disable-dependency-tracking --enable-sse2) ++ (cd crlibm && ./configure --disable-dependency-tracking --enable-sse2 $(CRLIBM_CONFIG_FLAGS) ) + + ## GNU MPFR api oct-files + mpfr_matrix_mul_d.oct mpfr_matrix_sqr_d.oct : mpfr_%.oct: mpfr_%.cc mpfr_commons.cc diff -r 33045d291c2b -r caa35339a354 src/of-interval.mk --- a/src/of-interval.mk Wed Jan 11 16:12:38 2017 -0500 +++ b/src/of-interval.mk Thu Jan 12 08:16:53 2017 -0500 @@ -3,8 +3,8 @@ PKG := of-interval $(PKG)_IGNORE := -$(PKG)_VERSION := 2.0.0 -$(PKG)_CHECKSUM := 29333d1663447bb3692ded247a102749b912108f +$(PKG)_VERSION := 2.1.0 +$(PKG)_CHECKSUM := f73289c4e0f46f66ac195a483470909bf54ad213 $(PKG)_REMOTE_SUBDIR := $(PKG)_SUBDIR := interval-$($(PKG)_VERSION) $(PKG)_FILE := interval-$($(PKG)_VERSION).tar.gz @@ -14,6 +14,12 @@ $(PKG)_DEPS += mpfr endif +ifeq ($(MXE_NATIVE_BUILD),no) +$(PKG)_OPTIONS := CRLIBM_CONFIG_FLAGS='--host=$(TARGET)' +else +$(PKG)_OPTIONS := +endif + define $(PKG)_UPDATE $(WGET) -q -O- 'http://$(SOURCEFORGE_MIRROR)/projects/octave/files/Octave%20Forge%20Packages/Individual%20Package%20Releases/' | \ $(SED) -n 's,.*title="interval-\([0-9][^"]*\).tar.gz".*,\1,p' | \ @@ -21,5 +27,5 @@ endef define $(PKG)_BUILD - $(OCTAVE_FORGE_PKG_BUILD) + $(call OCTAVE_FORGE_PKG_BUILD,$(1),$(2),$(3),$($(PKG)_OPTIONS)) endef