| 1 |
# -*- mode:diff;coding:raw-text; -*- |
| 2 |
diff -r -u ref/OpenBLAS/c_check OpenBLAS/c_check |
| 3 |
--- ref/OpenBLAS/c_check 2010-01-28 20:26:25.000000000 +0100 |
| 4 |
+++ OpenBLAS/c_check 2012-06-05 15:17:47.877934400 +0200 |
| 5 |
@@ -22,15 +22,16 @@ |
| 6 |
|
| 7 |
$cross_suffix = ""; |
| 8 |
|
| 9 |
-if ($ARGV[0] =~ /(.*)(-[.\d]+)/) { |
| 10 |
- if ($1 =~ /(.*-)(.*)/) { |
| 11 |
- $cross_suffix = $1; |
| 12 |
- } |
| 13 |
-} else { |
| 14 |
- if ($ARGV[0] =~ /(.*-)(.*)/) { |
| 15 |
- $cross_suffix = $1; |
| 16 |
- } |
| 17 |
-} |
| 18 |
+# FFCS - this test is broken when using full paths with dashes for compilers |
| 19 |
+#if ($ARGV[0] =~ /(.*)(-[.\d]+)/) { |
| 20 |
+# if ($1 =~ /(.*-)(.*)/) { |
| 21 |
+# $cross_suffix = $1; |
| 22 |
+# } |
| 23 |
+#} else { |
| 24 |
+# if ($ARGV[0] =~ /(.*-)(.*)/) { |
| 25 |
+# $cross_suffix = $1; |
| 26 |
+# } |
| 27 |
+#} |
| 28 |
|
| 29 |
$compiler = ""; |
| 30 |
$compiler = PGI if ($data =~ /COMPILER_PGI/); |
| 31 |
--- ref/OpenBLAS/Makefile.install 2017-02-23 17:40:19.000000000 +0100 |
| 32 |
+++ OpenBLAS/Makefile.install 2017-02-23 18:28:48.000000000 +0100 |
| 33 |
@@ -2,7 +2,7 @@ |
| 34 |
export GOTOBLAS_MAKEFILE = 1 |
| 35 |
-include $(TOPDIR)/Makefile.conf_last |
| 36 |
include ./Makefile.system |
| 37 |
- |
| 38 |
+install=../../../install-sh |
| 39 |
PREFIX ?= /opt/OpenBLAS |
| 40 |
|
| 41 |
OPENBLAS_INCLUDE_DIR := $(PREFIX)/include |
| 42 |
@@ -44,16 +44,16 @@ |
| 43 |
|
| 44 |
ifndef NO_LAPACKE |
| 45 |
@echo Copying LAPACKE header files to $(DESTDIR)$(OPENBLAS_LIBRARY_DIR) |
| 46 |
- @-install -pDm644 $(NETLIB_LAPACK_DIR)/lapacke/include/lapacke.h $(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/lapacke.h |
| 47 |
- @-install -pDm644 $(NETLIB_LAPACK_DIR)/lapacke/include/lapacke_config.h $(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/lapacke_config.h |
| 48 |
- @-install -pDm644 $(NETLIB_LAPACK_DIR)/lapacke/include/lapacke_mangling_with_flags.h $(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/lapacke_mangling.h |
| 49 |
- @-install -pDm644 $(NETLIB_LAPACK_DIR)/lapacke/include/lapacke_utils.h $(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/lapacke_utils.h |
| 50 |
+ @-$(install) -m 644 $(NETLIB_LAPACK_DIR)/lapacke/include/lapacke.h $(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/lapacke.h |
| 51 |
+ @-$(install) -m 644 $(NETLIB_LAPACK_DIR)/lapacke/include/lapacke_config.h $(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/lapacke_config.h |
| 52 |
+ @-$(install) -m 644 $(NETLIB_LAPACK_DIR)/lapacke/include/lapacke_mangling_with_flags.h $(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/lapacke_mangling.h |
| 53 |
+ @-$(install) -m 644 $(NETLIB_LAPACK_DIR)/lapacke/include/lapacke_utils.h $(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/lapacke_utils.h |
| 54 |
endif |
| 55 |
|
| 56 |
#for install static library |
| 57 |
ifndef NO_STATIC |
| 58 |
@echo Copying the static library to $(DESTDIR)$(OPENBLAS_LIBRARY_DIR) |
| 59 |
- @install -pm644 $(LIBNAME) $(DESTDIR)$(OPENBLAS_LIBRARY_DIR) |
| 60 |
+ @$(install) -m 644 $(LIBNAME) $(DESTDIR)$(OPENBLAS_LIBRARY_DIR) |
| 61 |
@cd $(DESTDIR)$(OPENBLAS_LIBRARY_DIR) ; \ |
| 62 |
ln -fs $(LIBNAME) $(LIBPREFIX).$(LIBSUFFIX) |
| 63 |
endif |
| 64 |
@@ -61,7 +61,7 @@ |
| 65 |
ifndef NO_SHARED |
| 66 |
@echo Copying the shared library to $(DESTDIR)$(OPENBLAS_LIBRARY_DIR) |
| 67 |
ifeq ($(OSNAME), Linux) |
| 68 |
- @install -pm755 $(LIBSONAME) $(DESTDIR)$(OPENBLAS_LIBRARY_DIR) |
| 69 |
+ @$(install) -m755 $(LIBSONAME) $(DESTDIR)$(OPENBLAS_LIBRARY_DIR) |
| 70 |
@cd $(DESTDIR)$(OPENBLAS_LIBRARY_DIR) ; \ |
| 71 |
ln -fs $(LIBSONAME) $(LIBPREFIX).so ; \ |
| 72 |
ln -fs $(LIBSONAME) $(LIBPREFIX).so.$(MAJOR_VERSION) |
| 73 |
@@ -78,7 +78,7 @@ |
| 74 |
endif |
| 75 |
ifeq ($(OSNAME), Darwin) |
| 76 |
@-cp $(LIBDYNNAME) $(DESTDIR)$(OPENBLAS_LIBRARY_DIR) |
| 77 |
- @-install_name_tool -id $(DESTDIR)$(OPENBLAS_LIBRARY_DIR)/$(LIBDYNNAME) $(DESTDIR)$(OPENBLAS_LIBRARY_DIR)/$(LIBDYNNAME) |
| 78 |
+ @-$(install)_name_tool -id $(DESTDIR)$(OPENBLAS_LIBRARY_DIR)/$(LIBDYNNAME) $(DESTDIR)$(OPENBLAS_LIBRARY_DIR)/$(LIBDYNNAME) |
| 79 |
@cd $(DESTDIR)$(OPENBLAS_LIBRARY_DIR) ; \ |
| 80 |
ln -fs $(LIBDYNNAME) $(LIBPREFIX).dylib |
| 81 |
endif |