# HG changeset patch # User John W. Eaton # Date 1379962087 14400 # Node ID 8c8dfed156385dde4a863599c93e18471839a9bc # Parent e3944cf36a545e876825d7fdfd9cf8eaedb23b43# Parent e8240c0feedde0e2c72146c61aef3af25bcd0cd3 merge away extra head diff -r e3944cf36a54 -r 8c8dfed15638 index.html --- a/index.html Mon Sep 23 14:43:37 2013 -0400 +++ b/index.html Mon Sep 23 14:48:07 2013 -0400 @@ -770,7 +770,7 @@ 
mingw-get install autoconf bash msys-flex gcc gcc-c++ \
 	      gcc-fortran gettext msys-m4 msys-make msys-sed \
 	      libiconv msys-openssl msys-patch msys-perl \
-              msys-libarchive msys-unzip msys-wget bsdcpio
+              msys-libarchive msys-unzip msys-wget msys-bsdtar

@@ -1095,7 +1095,7 @@ curl - 7.28.0 + 7.32.0 cURL @@ -1140,7 +1140,7 @@ fftw - 3.3.2 + 3.3.3 fftw @@ -1640,7 +1640,7 @@ libpng - 1.5.13 + 1.6.3 libpng @@ -1995,7 +1995,7 @@ openblas - 0.2.6 + 0.2.8 OpenBLAS @@ -2365,7 +2365,7 @@ zlib - 1.2.7 + 1.2.8 zlib diff -r e3944cf36a54 -r 8c8dfed15638 src/curl.mk --- a/src/curl.mk Mon Sep 23 14:43:37 2013 -0400 +++ b/src/curl.mk Mon Sep 23 14:48:07 2013 -0400 @@ -3,7 +3,7 @@ PKG := curl $(PKG)_IGNORE := -$(PKG)_CHECKSUM := f75cdcd81ae3cb1eef1b5ff9e736a46cb1d6d2c9 +$(PKG)_CHECKSUM := 76e8df2dade75120b75134468d02114370ea592d $(PKG)_SUBDIR := curl-$($(PKG)_VERSION) $(PKG)_FILE := curl-$($(PKG)_VERSION).tar.lzma $(PKG)_URL := http://curl.haxx.se/download/$($(PKG)_FILE) diff -r e3944cf36a54 -r 8c8dfed15638 src/fftw.mk --- a/src/fftw.mk Mon Sep 23 14:43:37 2013 -0400 +++ b/src/fftw.mk Mon Sep 23 14:48:07 2013 -0400 @@ -3,7 +3,7 @@ PKG := fftw $(PKG)_IGNORE := -$(PKG)_CHECKSUM := 11a8c31186ff5a7d686a79a3f21b2530888e0dc2 +$(PKG)_CHECKSUM := 11487180928d05746d431ebe7a176b52fe205cf9 $(PKG)_SUBDIR := fftw-$($(PKG)_VERSION) $(PKG)_FILE := fftw-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://www.fftw.org/$($(PKG)_FILE) diff -r e3944cf36a54 -r 8c8dfed15638 src/lapack.mk --- a/src/lapack.mk Mon Sep 23 14:43:37 2013 -0400 +++ b/src/lapack.mk Mon Sep 23 14:48:07 2013 -0400 @@ -9,6 +9,16 @@ $(PKG)_URL_2 := ftp://ftp.eq.uc.pt/pub/software/math/netlib/$(PKG)/$($(PKG)_FILE) $(PKG)_DEPS := +ifeq ($(ENABLE_OPENBLAS),yes) + $(PKG)_DEPS += openblas + + ifeq ($(MXE_NATIVE_MINGW_BUILD),yes) + $(PKG)_BLAS_CONFIG_OPTS := -DBLAS_LIBRARIES=$(HOST_BINDIR)/libopenblas.dll + else + $(PKG)_BLAS_CONFIG_OPTS := -DBLAS_LIBRARIES=openblas + endif +endif + ifeq ($(ENABLE_64),yes) $(PKG)_DEFAULT_INTEGER_8_FLAG := -fdefault-integer-8 endif @@ -47,6 +57,7 @@ -G 'MSYS Makefiles' \ -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ -DCMAKE_Fortran_FLAGS='$($(PKG)_DEFAULT_INTEGER_8_FLAG)' \ + $($(PKG)_BLAS_CONFIG_OPTS) \ . $(MAKE) -C '$(1)/SRC' -j '$(JOBS)' VERBOSE=1 install @@ -71,6 +82,7 @@ -DCMAKE_AR='$(MXE_AR)' \ -DCMAKE_RANLIB='$(MXE_RANLIB)' \ -DCMAKE_Fortran_FLAGS='$($(PKG)_DEFAULT_INTEGER_8_FLAG)' \ + $($(PKG)_BLAS_CONFIG_OPTS) \ . $(MAKE) -C '$(1)/SRC' -j '$(JOBS)' VERBOSE=1 install endef diff -r e3944cf36a54 -r 8c8dfed15638 src/libpng.mk --- a/src/libpng.mk Mon Sep 23 14:43:37 2013 -0400 +++ b/src/libpng.mk Mon Sep 23 14:48:07 2013 -0400 @@ -3,7 +3,7 @@ PKG := libpng $(PKG)_IGNORE := -$(PKG)_CHECKSUM := a6c0fc33b2031e4a9154da03c7d4e7807bc039e7 +$(PKG)_CHECKSUM := adc60a2c117a0929e18bf357e0a1e6115a9e3b76 $(PKG)_SUBDIR := libpng-$($(PKG)_VERSION) $(PKG)_FILE := libpng-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)$(subst .,,$(call SHORT_PKG_VERSION,$(PKG)))/older-releases/$($(PKG)_VERSION)/$($(PKG)_FILE) diff -r e3944cf36a54 -r 8c8dfed15638 src/llvm.mk --- a/src/llvm.mk Mon Sep 23 14:43:37 2013 -0400 +++ b/src/llvm.mk Mon Sep 23 14:48:07 2013 -0400 @@ -48,11 +48,23 @@ $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --enable-targets='host-only' \ --disable-docs \ - --without-python \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' PATH='$(HOST_BINDIR):$(PATH)' $(MAKE) -C '$(1)/build' -j $(JOBS) install + + # create import lib for the dll + $(if $(filter yes, $(BUILD_SHARED)), + cd '$(1)/build/tools/llvm-shlib/Release+Asserts' && \ + $(MXE_DLLTOOL) \ + --dllname "LLVM-`$(HOST_BINDIR)/llvm-config --version`.dll" \ + --def "LLVM-`$(HOST_BINDIR)/llvm-config --version`.def" \ + --output-lib "libLLVM-`$(HOST_BINDIR)/llvm-config --version`.a" + cd '$(1)/build/tools/llvm-shlib/Release+Asserts' && \ + $(INSTALL) -m644 \ + "libLLVM-`$(HOST_BINDIR)/llvm-config --version`.a" \ + "$(HOST_LIBDIR)" + ) endef endif else diff -r e3944cf36a54 -r 8c8dfed15638 src/msvc-fftw-1.patch --- a/src/msvc-fftw-1.patch Mon Sep 23 14:43:37 2013 -0400 +++ b/src/msvc-fftw-1.patch Mon Sep 23 14:48:07 2013 -0400 @@ -1,6 +1,6 @@ -diff -ur fftw-3.3.2-orig/api/fftw3.h fftw-3.3.2/api/fftw3.h ---- fftw-3.3.2-orig/api/fftw3.h 2012-04-28 10:58:06 -0400 -+++ fftw-3.3.2/api/fftw3.h 2013-06-24 17:32:40 -0400 +diff -ur fftw-3.3.3.orig/api/fftw3.h fftw-3.3.3/api/fftw3.h +--- fftw-3.3.3.orig/api/fftw3.h 2013-08-30 20:48:15 -0400 ++++ fftw-3.3.3/api/fftw3.h 2013-08-30 20:48:31 -0400 @@ -82,8 +82,14 @@ # else /* user is calling FFTW; import symbol */ # define FFTW_EXTERN extern __declspec(dllimport) @@ -29,9 +29,9 @@ \ FFTW_EXTERN int X(export_wisdom_to_filename)(const char *filename); \ FFTW_EXTERN void X(export_wisdom_to_file)(FILE *output_file); \ -diff -ur fftw-3.3.2-orig/dft/ct.h fftw-3.3.2/dft/ct.h ---- fftw-3.3.2-orig/dft/ct.h 2012-04-28 10:58:06 -0400 -+++ fftw-3.3.2/dft/ct.h 2013-06-24 15:28:17 -0400 +diff -ur fftw-3.3.3.orig/dft/ct.h fftw-3.3.3/dft/ct.h +--- fftw-3.3.3.orig/dft/ct.h 2013-08-30 20:48:15 -0400 ++++ fftw-3.3.3/dft/ct.h 2013-08-30 20:48:31 -0400 @@ -56,7 +56,7 @@ ct_solver *X(mksolver_ct)(size_t size, INT r, int dec, ct_mkinferior mkcldw, @@ -41,9 +41,9 @@ ct_mkinferior, ct_force_vrecursion); void X(regsolver_ct_directw)(planner *plnr, -diff -ur fftw-3.3.2-orig/rdft/hc2hc.h fftw-3.3.2/rdft/hc2hc.h ---- fftw-3.3.2-orig/rdft/hc2hc.h 2012-04-28 10:58:06 -0400 -+++ fftw-3.3.2/rdft/hc2hc.h 2013-06-24 15:28:36 -0400 +diff -ur fftw-3.3.3.orig/rdft/hc2hc.h fftw-3.3.3/rdft/hc2hc.h +--- fftw-3.3.3.orig/rdft/hc2hc.h 2013-08-30 20:48:17 -0400 ++++ fftw-3.3.3/rdft/hc2hc.h 2013-08-30 20:48:31 -0400 @@ -46,7 +46,7 @@ }; @@ -53,10 +53,10 @@ void X(regsolver_hc2hc_direct)(planner *plnr, khc2hc codelet, const hc2hc_desc *desc); -diff -ur fftw-3.3.2-orig/tests/Makefile.in fftw-3.3.2/tests/Makefile.in ---- fftw-3.3.2-orig/tests/Makefile.in 2012-04-28 10:58:44 -0400 -+++ fftw-3.3.2/tests/Makefile.in 2013-06-24 19:57:50 -0400 -@@ -65,7 +65,7 @@ +diff -ur fftw-3.3.3.orig/tests/Makefile.in fftw-3.3.3/tests/Makefile.in +--- fftw-3.3.3.orig/tests/Makefile.in 2013-08-30 20:48:17 -0400 ++++ fftw-3.3.3/tests/Makefile.in 2013-08-30 20:48:31 -0400 +@@ -82,7 +82,7 @@ $(top_builddir)/libbench2/libbench2.a $(am__DEPENDENCIES_1) bench_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) $(bench_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ @@ -65,7 +65,7 @@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles -@@ -229,7 +229,7 @@ +@@ -251,7 +251,7 @@ top_srcdir = @top_srcdir@ AM_CPPFLAGS = -I$(top_srcdir)/kernel -I$(top_srcdir)/libbench2 \ -I$(top_srcdir)/dft -I$(top_srcdir)/rdft -I$(top_srcdir)/reodft \ @@ -74,10 +74,10 @@ EXTRA_DIST = check.pl README @OPENMP_TRUE@@THREADS_FALSE@bench_CFLAGS = $(OPENMP_CFLAGS) -diff -ur fftw-3.3.2-orig/threads/Makefile.in fftw-3.3.2/threads/Makefile.in ---- fftw-3.3.2-orig/threads/Makefile.in 2012-04-28 10:58:44 -0400 -+++ fftw-3.3.2/threads/Makefile.in 2013-06-24 17:28:37 -0400 -@@ -291,7 +291,8 @@ +diff -ur fftw-3.3.3.orig/threads/Makefile.in fftw-3.3.3/threads/Makefile.in +--- fftw-3.3.3.orig/threads/Makefile.in 2013-08-30 20:48:17 -0400 ++++ fftw-3.3.3/threads/Makefile.in 2013-08-30 20:48:31 -0400 +@@ -313,7 +313,8 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AM_CPPFLAGS = -I$(top_srcdir)/kernel -I$(top_srcdir)/dft \ @@ -87,7 +87,7 @@ AM_CFLAGS = $(STACK_ALIGN_CFLAGS) @OPENMP_FALSE@FFTWOMPLIB = -@@ -307,7 +308,7 @@ +@@ -329,7 +330,7 @@ vrank-geq1-rdft2.c f77api.c f77funcs.h libfftw3@PREC_SUFFIX@_threads_la_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) @@ -96,10 +96,10 @@ @COMBINED_THREADS_FALSE@libfftw3@PREC_SUFFIX@_threads_la_LIBADD = ../libfftw3@PREC_SUFFIX@.la libfftw3@PREC_SUFFIX@_omp_la_SOURCES = api.c conf.c openmp.c \ threads.h dft-vrank-geq1.c ct.c rdft-vrank-geq1.c hc2hc.c \ -diff -ur fftw-3.3.2-orig/tools/Makefile.in fftw-3.3.2/tools/Makefile.in ---- fftw-3.3.2-orig/tools/Makefile.in 2012-04-28 10:58:44 -0400 -+++ fftw-3.3.2/tools/Makefile.in 2013-06-24 20:01:18 -0400 -@@ -74,7 +74,7 @@ +diff -ur fftw-3.3.3.orig/tools/Makefile.in fftw-3.3.3/tools/Makefile.in +--- fftw-3.3.3.orig/tools/Makefile.in 2013-08-30 20:48:17 -0400 ++++ fftw-3.3.3/tools/Makefile.in 2013-08-30 20:48:31 -0400 +@@ -91,7 +91,7 @@ fftw@PREC_SUFFIX@_wisdom_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(fftw@PREC_SUFFIX@_wisdom_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ diff -r e3944cf36a54 -r 8c8dfed15638 src/openblas.mk --- a/src/openblas.mk Mon Sep 23 14:43:37 2013 -0400 +++ b/src/openblas.mk Mon Sep 23 14:48:07 2013 -0400 @@ -3,7 +3,7 @@ PKG := openblas $(PKG)_IGNORE := -$(PKG)_CHECKSUM := f5c040660cb83630f9ac3e34a907889dcfac3415 +$(PKG)_CHECKSUM := d012ebc2b8dcd3e95f667dff08318a81479a47c3 $(PKG)_SUBDIR := OpenBLAS-$($(PKG)_VERSION) $(PKG)_FILE := $($(PKG)_SUBDIR).tar.gz $(PKG)_URL := http://github.com/xianyi/OpenBLAS/archive/v$($(PKG)_VERSION).tar.gz diff -r e3944cf36a54 -r 8c8dfed15638 src/zlib-1-win32-static.patch --- a/src/zlib-1-win32-static.patch Mon Sep 23 14:43:37 2013 -0400 +++ b/src/zlib-1-win32-static.patch Mon Sep 23 14:48:07 2013 -0400 @@ -3,17 +3,24 @@ Contains ad hoc patches for cross building. -From dfe5701faf3683be7ea53885c58d4bd3499c4d1c Mon Sep 17 00:00:00 2001 -From: MXE -Date: Sun, 29 Jan 2012 21:51:03 +0100 -Subject: [PATCH] workarounds for MXE - - -diff --git a/Makefile.in b/Makefile.in -index ea430bf..f2573e7 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -190,11 +190,11 @@ install-libs: $(LIBS) +diff -urN a/configure b/configure +--- a/configure 2013-03-24 06:30:09.000000000 +0100 ++++ b/configure 2013-04-29 12:19:25.526304670 +0200 +@@ -191,10 +191,7 @@ + CYGWIN* | Cygwin* | cygwin* | OS/2*) + EXE='.exe' ;; + MINGW* | mingw*) +-# temporary bypass + rm -f $test.[co] $test $test$shared_ext +- echo "Please use win32/Makefile.gcc instead." | tee -a configure.log +- leave 1 + LDSHARED=${LDSHARED-"$cc -shared"} + LDSHAREDLIBC="" + EXE='.exe' ;; +diff -urN a/Makefile.in b/Makefile.in +--- a/Makefile.in 2013-04-29 00:57:11.000000000 +0200 ++++ b/Makefile.in 2013-04-29 12:16:08.631379491 +0200 +@@ -190,11 +190,11 @@ -@if [ ! -d $(DESTDIR)$(sharedlibdir) ]; then mkdir -p $(DESTDIR)$(sharedlibdir); fi -@if [ ! -d $(DESTDIR)$(man3dir) ]; then mkdir -p $(DESTDIR)$(man3dir); fi -@if [ ! -d $(DESTDIR)$(pkgconfigdir) ]; then mkdir -p $(DESTDIR)$(pkgconfigdir); fi @@ -27,21 +34,3 @@ echo "cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)"; \ chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV); \ echo "chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV)"; \ -diff --git a/configure b/configure -index 780317c..6e6a033 100755 ---- a/configure -+++ b/configure -@@ -205,10 +205,7 @@ if test "$gcc" -eq 1 && ($cc -c $cflags $test.c) >> configure.log 2>&1; then - CYGWIN* | Cygwin* | cygwin* | OS/2*) - EXE='.exe' ;; - MINGW* | mingw*) --# temporary bypass - rm -f $test.[co] $test $test$shared_ext -- echo "Please use win32/Makefile.gcc instead." | tee -a configure.log -- exit 1 - LDSHARED=${LDSHARED-"$cc -shared"} - LDSHAREDLIBC="" - EXE='.exe' ;; --- -1.7.8.3 - diff -r e3944cf36a54 -r 8c8dfed15638 src/zlib.mk --- a/src/zlib.mk Mon Sep 23 14:43:37 2013 -0400 +++ b/src/zlib.mk Mon Sep 23 14:48:07 2013 -0400 @@ -3,9 +3,9 @@ PKG := zlib $(PKG)_IGNORE := -$(PKG)_CHECKSUM := 858818fe6d358ec682d54ac5e106a2dd62628e7f +$(PKG)_CHECKSUM := b598beb7acc96347cbd1020b71aef7871d374677 $(PKG)_SUBDIR := zlib-$($(PKG)_VERSION) -$(PKG)_FILE := zlib-$($(PKG)_VERSION).tar.bz2 +$(PKG)_FILE := zlib-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://zlib.net/$($(PKG)_FILE) $(PKG)_URL_2 := http://$(SOURCEFORGE_MIRROR)/project/libpng/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_DEPS := diff -r e3944cf36a54 -r 8c8dfed15638 tools/set_mxe_env.sh.in --- a/tools/set_mxe_env.sh.in Mon Sep 23 14:43:37 2013 -0400 +++ b/tools/set_mxe_env.sh.in Mon Sep 23 14:48:07 2013 -0400 @@ -1,24 +1,28 @@ #!/bin/bash MXEDIR=@MXE_ROOTDIR@ -if [ "@MXE_NATIVE_BUILD@" = "yes" ]; then - HOST="" -else - HOST=$($MXEDIR/tools/config.guess) -fi - if [ -z "$MXE_OCTAVE_ENV" ]; then -export PATH="$MXEDIR/usr/$HOST/bin:$MXEDIR/usr/bin:$PATH" -export CPPFLAGS="-I$MXEDIR/usr/$HOST/include" -export LDFLAGS="-L$MXEDIR/usr/$HOST/lib" -export LD_LIBRARY_PATH="$MXEDIR/usr/$HOST/lib:$LD_LIBRARY_PATH" -export PKG_CONFIG_PATH="$MXEDIR/usr/$HOST/lib/pkgconfig" -export PKG_CONFIG="$MXEDIR/usr/bin/pkg-config@EXEEXT@" + if [ "@MXE_NATIVE_BUILD@" = "yes" ]; then + MXE_PATH="$MXEDIR/usr/bin" + MXE_INC_PATH="$MXEDIR/usr/include" + MXE_LIB_PATH="$MXEDIR/usr/lib" + else + HOST=$($MXEDIR/tools/config.guess) -export MXE_OCTAVE_ENV=$MXEDIR + MXE_PATH="$MXEDIR/usr/$HOST/bin:$MXEDIR/usr/bin" + MXE_INC_PATH="$MXEDIR/usr/$HOST/include" + MXE_LIB_PATH="$MXEDIR/usr/$HOST/lib" + fi + + export PATH="$MXE_PATH:$PATH" + export CPPFLAGS="-I$MXE_INC_PATH" + export LDFLAGS="-L$MXE_LIB_PATH" + export LD_LIBRARY_PATH="$MXE_LIB_PATH:$LD_LIBRARY_PATH" + export PKG_CONFIG_PATH="$MXE_LIB_PATH/pkgconfig" + export PKG_CONFIG="$MXEDIR/usr/bin/pkg-config@EXEEXT@" + + export MXE_OCTAVE_ENV=$MXEDIR fi - -