diff options
| author | Timothy Gu <timothygu99@gmail.com> | 2014-06-27 21:03:26 (GMT) |
|---|---|---|
| committer | Timothy Gu <timothygu99@gmail.com> | 2014-06-27 21:04:12 (GMT) |
| commit | 7a8366ae83cd034c4bd425952f88b824aa6a7276 (patch) | |
| tree | 7e34f6949ae6445d07387d0d4d3024994332b54a | |
| parent | 862513406dc027c84edf78f10f737f928635afd2 (diff) | |
| download | mxe-7a8366ae83cd034c4bd425952f88b824aa6a7276.zip mxe-7a8366ae83cd034c4bd425952f88b824aa6a7276.tar.gz mxe-7a8366ae83cd034c4bd425952f88b824aa6a7276.tar.bz2 | |
openblas: update
Closes #408.
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
| -rw-r--r-- | src/openblas-1-fix-import-lib.patch | 45 | ||||
| -rw-r--r-- | src/openblas.mk | 5 |
2 files changed, 48 insertions, 2 deletions
diff --git a/src/openblas-1-fix-import-lib.patch b/src/openblas-1-fix-import-lib.patch new file mode 100644 index 0000000..692eacb --- /dev/null +++ b/src/openblas-1-fix-import-lib.patch @@ -0,0 +1,45 @@ +This file is part of MXE. +See index.html for further information. + +From d307d2b671c5bc1e3bab850dcb8c3450fee62f66 Mon Sep 17 00:00:00 2001 +From: Timothy Gu <timothygu99@gmail.com> +Date: Fri, 27 Jun 2014 11:58:14 -0700 +Subject: [PATCH] Build import libs as .dll.a instead of .lib + +This is MinGW convention. + +Signed-off-by: Timothy Gu <timothygu99@gmail.com> +--- + Makefile.install | 2 +- + exports/Makefile | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile.install b/Makefile.install +index 9fc8d7a..7eb7b5f 100644 +--- a/Makefile.install ++++ b/Makefile.install +@@ -83,7 +83,7 @@ ifeq ($(OSNAME), Darwin) + endif + ifeq ($(OSNAME), WINNT) + @-cp $(LIBDLLNAME) $(OPENBLAS_BINARY_DIR) +- @-cp $(LIBPREFIX).lib $(OPENBLAS_LIBRARY_DIR) ++ @-cp $(LIBDLLNAME).a $(OPENBLAS_LIBRARY_DIR) + endif + ifeq ($(OSNAME), CYGWIN_NT) + @-cp $(LIBDLLNAME) $(OPENBLAS_BINARY_DIR) +diff --git a/exports/Makefile b/exports/Makefile +index 3ef20b3..ce28ab5 100644 +--- a/exports/Makefile ++++ b/exports/Makefile +@@ -84,7 +84,7 @@ dll : ../$(LIBDLLNAME) + ../$(LIBDLLNAME) : ../$(LIBNAME) libopenblas.def dllinit.$(SUFFIX) + $(RANLIB) ../$(LIBNAME) + $(CC) $(CFLAGS) $(LDFLAGS) libopenblas.def dllinit.$(SUFFIX) \ +- -shared -o ../$(LIBDLLNAME) -Wl,--out-implib,../$(LIBPREFIX).lib \ ++ -shared -o ../$(LIBDLLNAME) -Wl,--out-implib,../$(LIBDLLNAME).a \ + -Wl,--whole-archive ../$(LIBNAME) -Wl,--no-whole-archive $(FEXTRALIB) + + libopenblas.def : gensymbol +-- +1.9.1 + diff --git a/src/openblas.mk b/src/openblas.mk index b19fb2b..fffd6ed 100644 --- a/src/openblas.mk +++ b/src/openblas.mk @@ -3,8 +3,8 @@ PKG := openblas $(PKG)_IGNORE := -$(PKG)_VERSION := 0.2.8 -$(PKG)_CHECKSUM := d012ebc2b8dcd3e95f667dff08318a81479a47c3 +$(PKG)_VERSION := 0.2.9 +$(PKG)_CHECKSUM := e8197711c4fe43ac286366693bd7c1683003c894 $(PKG)_SUBDIR := OpenBLAS-$($(PKG)_VERSION) $(PKG)_FILE := $($(PKG)_SUBDIR).tar.gz $(PKG)_URL := http://github.com/xianyi/OpenBLAS/archive/v$($(PKG)_VERSION).tar.gz @@ -37,6 +37,7 @@ $(PKG)_MAKE_OPTS = \ $(if $(findstring i686,$(TARGET)),x86)) \ BINARY=$(if $(findstring x86_64,$(TARGET)),64,32)) \ $(if $(BUILD_STATIC),NO_SHARED=1) \ + $(if $(BUILD_SHARED),NO_STATIC=1) \ EXTRALIB="`'$(TARGET)-pkg-config' --libs pthreads` -fopenmp" define $(PKG)_BUILD |