From d934827bf44b7cfcf6711964418148fa60877668 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 25 Nov 2020 22:39:15 +0000 Subject: gentoo resync : 25.11.2020 --- .../files/cblas-reference-20030223-autotool.patch | 567 --------------------- .../cblas-reference/files/eselect.cblas.reference | 5 - .../files/eselect.cblas.reference-r2 | 8 - .../lapack-reference-3.6.0-fix-build-system.patch | 124 ----- .../lapack-reference-3.7.0-fix-build-system.patch | 56 -- 5 files changed, 760 deletions(-) delete mode 100644 sci-libs/cblas-reference/files/cblas-reference-20030223-autotool.patch delete mode 100644 sci-libs/cblas-reference/files/eselect.cblas.reference delete mode 100644 sci-libs/cblas-reference/files/eselect.cblas.reference-r2 delete mode 100644 sci-libs/cblas-reference/files/lapack-reference-3.6.0-fix-build-system.patch delete mode 100644 sci-libs/cblas-reference/files/lapack-reference-3.7.0-fix-build-system.patch (limited to 'sci-libs/cblas-reference/files') diff --git a/sci-libs/cblas-reference/files/cblas-reference-20030223-autotool.patch b/sci-libs/cblas-reference/files/cblas-reference-20030223-autotool.patch deleted file mode 100644 index 0dd595bf4a21..000000000000 --- a/sci-libs/cblas-reference/files/cblas-reference-20030223-autotool.patch +++ /dev/null @@ -1,567 +0,0 @@ ---- configure.ac 1970-01-01 01:00:00.000000000 +0100 -+++ configure.ac 2007-11-09 17:59:16.000000000 +0000 -@@ -0,0 +1,24 @@ -+AC_PREREQ(2.59) -+AC_INIT(cblas, 20030223, lapack@cs.utk.edu) -+AC_CONFIG_SRCDIR([cblas_example2.c]) -+AC_CONFIG_HEADER([config.h]) -+AM_INIT_AUTOMAKE([foreign]) -+ -+AC_LANG(C) -+AC_PROG_CC -+AC_PROG_F77 -+AC_F77_LIBRARY_LDFLAGS -+AC_PROG_LIBTOOL -+ -+sinclude(acx_blas.m4) -+ACX_BLAS -+if test x"$BLAS_LIBS" = x; then -+ AC_MSG_ERROR([Cannot find blas libraries]) -+fi -+ -+ -+AC_CONFIG_FILES([Makefile -+ src/Makefile -+ testing/Makefile -+ cblas.pc]) -+AC_OUTPUT ---- Makefile.am 1970-01-01 01:00:00.000000000 +0100 -+++ Makefile.am 2007-11-09 16:20:41.000000000 +0000 -@@ -0,0 +1,8 @@ -+SUBDIRS = src testing -+ -+pkgconfigdir = $(libdir) -+pkgconfig_DATA = cblas.pc -+ -+EXTRA = cblas.pc -+ -+ ---- cblas.pc.in 1970-01-01 01:00:00.000000000 +0100 -+++ cblas.pc.in 2007-11-09 16:20:41.000000000 +0000 -@@ -0,0 +1,13 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: @PACKAGE_NAME@ -+Description: Basic Linear Algebra Subprograms C reference wrapper -+Version: @PACKAGE_VERSION@ -+Requires: blas -+URL: http://www.netlib.org/blas/ -+Libs: -lcblas -+Libs.private: @FLIBS@ -+Cflags: -I${includedir} ---- acx_blas.m4 1970-01-01 01:00:00.000000000 +0100 -+++ acx_blas.m4 2007-08-04 22:50:48.000000000 +0100 -@@ -0,0 +1,191 @@ -+##### http://autoconf-archive.cryp.to/acx_blas.html -+# -+# SYNOPSIS -+# -+# ACX_BLAS([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) -+# -+# DESCRIPTION -+# -+# This macro looks for a library that implements the BLAS -+# linear-algebra interface (see http://www.netlib.org/blas/). On -+# success, it sets the BLAS_LIBS output variable to hold the -+# requisite library linkages. -+# -+# To link with BLAS, you should link with: -+# -+# $BLAS_LIBS $LIBS $FLIBS -+# -+# in that order. FLIBS is the output variable of the -+# AC_F77_LIBRARY_LDFLAGS macro (called if necessary by ACX_BLAS), and -+# is sometimes necessary in order to link with F77 libraries. Users -+# will also need to use AC_F77_DUMMY_MAIN (see the autoconf manual), -+# for the same reason. -+# -+# Many libraries are searched for, from ATLAS to CXML to ESSL. The -+# user may also use --with-blas= in order to use some specific -+# BLAS library . In order to link successfully, however, be -+# aware that you will probably need to use the same Fortran compiler -+# (which can be set via the F77 env. var.) as was used to compile the -+# BLAS library. -+# -+# ACTION-IF-FOUND is a list of shell commands to run if a BLAS -+# library is found, and ACTION-IF-NOT-FOUND is a list of commands to -+# run it if it is not found. If ACTION-IF-FOUND is not specified, the -+# default action will define HAVE_BLAS. -+# -+# This macro requires autoconf 2.50 or later. -+# -+# LAST MODIFICATION -+# -+# 2007-07-29 -+# -+# COPYLEFT -+# -+# Copyright (c) 2007 Steven G. Johnson -+# -+# This program is free software: you can redistribute it and/or -+# modify it under the terms of the GNU General Public License as -+# published by the Free Software Foundation, either version 3 of the -+# License, or (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, but -+# WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+# General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program. If not, see -+# . -+# -+# As a special exception, the respective Autoconf Macro's copyright -+# owner gives unlimited permission to copy, distribute and modify the -+# configure scripts that are the output of Autoconf when processing -+# the Macro. You need not follow the terms of the GNU General Public -+# License when using or distributing such scripts, even though -+# portions of the text of the Macro appear in them. The GNU General -+# Public License (GPL) does govern all other use of the material that -+# constitutes the Autoconf Macro. -+# -+# This special exception to the GPL applies to versions of the -+# Autoconf Macro released by the Autoconf Macro Archive. When you -+# make and distribute a modified version of the Autoconf Macro, you -+# may extend this special exception to the GPL to apply to your -+# modified version as well. -+ -+AC_DEFUN([ACX_BLAS], [ -+AC_PREREQ(2.50) -+AC_REQUIRE([AC_F77_LIBRARY_LDFLAGS]) -+acx_blas_ok=no -+ -+AC_ARG_WITH(blas, -+ [AC_HELP_STRING([--with-blas=], [use BLAS library ])]) -+case $with_blas in -+ yes | "") ;; -+ no) acx_blas_ok=disable ;; -+ -* | */* | *.a | *.so | *.so.* | *.o) BLAS_LIBS="$with_blas" ;; -+ *) BLAS_LIBS="-l$with_blas" ;; -+esac -+ -+# Get fortran linker names of BLAS functions to check for. -+AC_F77_FUNC(sgemm) -+AC_F77_FUNC(dgemm) -+ -+acx_blas_save_LIBS="$LIBS" -+LIBS="$LIBS $FLIBS" -+ -+# First, check BLAS_LIBS environment variable -+if test $acx_blas_ok = no; then -+if test "x$BLAS_LIBS" != x; then -+ save_LIBS="$LIBS"; LIBS="$BLAS_LIBS $LIBS" -+ AC_MSG_CHECKING([for $sgemm in $BLAS_LIBS]) -+ AC_TRY_LINK_FUNC($sgemm, [acx_blas_ok=yes], [BLAS_LIBS=""]) -+ AC_MSG_RESULT($acx_blas_ok) -+ LIBS="$save_LIBS" -+fi -+fi -+ -+# BLAS linked to by default? (happens on some supercomputers) -+if test $acx_blas_ok = no; then -+ save_LIBS="$LIBS"; LIBS="$LIBS" -+ AC_CHECK_FUNC($sgemm, [acx_blas_ok=yes]) -+ LIBS="$save_LIBS" -+fi -+ -+# BLAS in ATLAS library? (http://math-atlas.sourceforge.net/) -+if test $acx_blas_ok = no; then -+ AC_CHECK_LIB(atlas, ATL_xerbla, -+ [AC_CHECK_LIB(f77blas, $sgemm, -+ [AC_CHECK_LIB(cblas, cblas_dgemm, -+ [acx_blas_ok=yes -+ BLAS_LIBS="-lcblas -lf77blas -latlas"], -+ [], [-lf77blas -latlas])], -+ [], [-latlas])]) -+fi -+ -+# BLAS in PhiPACK libraries? (requires generic BLAS lib, too) -+if test $acx_blas_ok = no; then -+ AC_CHECK_LIB(blas, $sgemm, -+ [AC_CHECK_LIB(dgemm, $dgemm, -+ [AC_CHECK_LIB(sgemm, $sgemm, -+ [acx_blas_ok=yes; BLAS_LIBS="-lsgemm -ldgemm -lblas"], -+ [], [-lblas])], -+ [], [-lblas])]) -+fi -+ -+# BLAS in Alpha CXML library? -+if test $acx_blas_ok = no; then -+ AC_CHECK_LIB(cxml, $sgemm, [acx_blas_ok=yes;BLAS_LIBS="-lcxml"]) -+fi -+ -+# BLAS in Alpha DXML library? (now called CXML, see above) -+if test $acx_blas_ok = no; then -+ AC_CHECK_LIB(dxml, $sgemm, [acx_blas_ok=yes;BLAS_LIBS="-ldxml"]) -+fi -+ -+# BLAS in Sun Performance library? -+if test $acx_blas_ok = no; then -+ if test "x$GCC" != xyes; then # only works with Sun CC -+ AC_CHECK_LIB(sunmath, acosp, -+ [AC_CHECK_LIB(sunperf, $sgemm, -+ [BLAS_LIBS="-xlic_lib=sunperf -lsunmath" -+ acx_blas_ok=yes],[],[-lsunmath])]) -+ fi -+fi -+ -+# BLAS in SCSL library? (SGI/Cray Scientific Library) -+if test $acx_blas_ok = no; then -+ AC_CHECK_LIB(scs, $sgemm, [acx_blas_ok=yes; BLAS_LIBS="-lscs"]) -+fi -+ -+# BLAS in SGIMATH library? -+if test $acx_blas_ok = no; then -+ AC_CHECK_LIB(complib.sgimath, $sgemm, -+ [acx_blas_ok=yes; BLAS_LIBS="-lcomplib.sgimath"]) -+fi -+ -+# BLAS in IBM ESSL library? (requires generic BLAS lib, too) -+if test $acx_blas_ok = no; then -+ AC_CHECK_LIB(blas, $sgemm, -+ [AC_CHECK_LIB(essl, $sgemm, -+ [acx_blas_ok=yes; BLAS_LIBS="-lessl -lblas"], -+ [], [-lblas $FLIBS])]) -+fi -+ -+# Generic BLAS library? -+if test $acx_blas_ok = no; then -+ AC_CHECK_LIB(blas, $sgemm, [acx_blas_ok=yes; BLAS_LIBS="-lblas"]) -+fi -+ -+AC_SUBST(BLAS_LIBS) -+ -+LIBS="$acx_blas_save_LIBS" -+ -+# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: -+if test x"$acx_blas_ok" = xyes; then -+ ifelse([$1],,AC_DEFINE(HAVE_BLAS,1,[Define if you have a BLAS library.]),[$1]) -+ : -+else -+ acx_blas_ok=no -+ $2 -+fi -+])dnl ACX_BLAS ---- src/Makefile.am 1970-01-01 01:00:00.000000000 +0100 -+++ src/Makefile.am 2007-11-09 16:20:41.000000000 +0000 -@@ -0,0 +1,232 @@ -+lib_LTLIBRARIES = libcblas.la -+ -+pkgincludedir = $(includedir)/cblas -+pkginclude_HEADERS = cblas.h -+ -+AM_CPPFLAGS = -DADD_ -+ -+ERRHAND_SOURCES = \ -+ cblas_globals.c \ -+ cblas_xerbla.c \ -+ xerbla.c -+ -+SINGLE_SOURCES = \ -+ cblas_scasum.c \ -+ cblas_scnrm2.c \ -+ scasumsub.f \ -+ scnrm2sub.f -+ -+SLEV_SOURCES = \ -+ isamaxsub.f \ -+ sdotsub.f \ -+ sdsdotsub.f \ -+ snrm2sub.f \ -+ sasumsub.f -+ -+SLEV1_SOURCES = \ -+ cblas_srotg.c \ -+ cblas_srotmg.c \ -+ cblas_srot.c \ -+ cblas_srotm.c \ -+ cblas_sswap.c \ -+ cblas_sscal.c \ -+ cblas_scopy.c \ -+ cblas_saxpy.c \ -+ cblas_sdot.c \ -+ cblas_sdsdot.c \ -+ cblas_snrm2.c \ -+ cblas_sasum.c \ -+ cblas_isamax.c -+ -+SLEV2_SOURCES = \ -+ cblas_sgemv.c \ -+ cblas_sgbmv.c \ -+ cblas_sger.c \ -+ cblas_ssbmv.c \ -+ cblas_sspmv.c \ -+ cblas_sspr.c \ -+ cblas_sspr2.c \ -+ cblas_ssymv.c \ -+ cblas_ssyr.c \ -+ cblas_ssyr2.c \ -+ cblas_stbmv.c \ -+ cblas_stbsv.c \ -+ cblas_stpmv.c \ -+ cblas_stpsv.c \ -+ cblas_strmv.c \ -+ cblas_strsv.c -+ -+SLEV3_SOURCES = \ -+ cblas_sgemm.c \ -+ cblas_ssymm.c \ -+ cblas_ssyrk.c \ -+ cblas_ssyr2k.c \ -+ cblas_strmm.c \ -+ cblas_strsm.c -+ -+DLEV_SOURCES = \ -+ ddotsub.f \ -+ dsdotsub.f \ -+ dnrm2sub.f \ -+ dasumsub.f \ -+ idamaxsub.f -+ -+DLEV1_SOURCES = \ -+ cblas_drotg.c \ -+ cblas_drotmg.c \ -+ cblas_drot.c \ -+ cblas_drotm.c \ -+ cblas_dswap.c \ -+ cblas_dscal.c \ -+ cblas_dcopy.c \ -+ cblas_daxpy.c \ -+ cblas_ddot.c \ -+ cblas_dsdot.c \ -+ cblas_dnrm2.c \ -+ cblas_dasum.c \ -+ cblas_idamax.c -+ -+DLEV2_SOURCES = \ -+ cblas_dgemv.c \ -+ cblas_dgbmv.c \ -+ cblas_dger.c \ -+ cblas_dsbmv.c \ -+ cblas_dspmv.c \ -+ cblas_dspr.c \ -+ cblas_dspr2.c \ -+ cblas_dsymv.c \ -+ cblas_dsyr.c \ -+ cblas_dsyr2.c \ -+ cblas_dtbmv.c \ -+ cblas_dtbsv.c \ -+ cblas_dtpmv.c \ -+ cblas_dtpsv.c \ -+ cblas_dtrmv.c \ -+ cblas_dtrsv.c -+ -+DLEV3_SOURCES = \ -+ cblas_dgemm.c \ -+ cblas_dsymm.c \ -+ cblas_dsyrk.c \ -+ cblas_dsyr2k.c \ -+ cblas_dtrmm.c \ -+ cblas_dtrsm.c -+ -+CLEV_SOURCES = \ -+ cdotcsub.f \ -+ cdotusub.f \ -+ icamaxsub.f -+ -+CLEV1_SOURCES = \ -+ cblas_cswap.c \ -+ cblas_cscal.c \ -+ cblas_csscal.c \ -+ cblas_ccopy.c \ -+ cblas_caxpy.c \ -+ cblas_cdotu_sub.c \ -+ cblas_cdotc_sub.c \ -+ cblas_icamax.c -+ -+CLEV2_SOURCES = \ -+ cblas_cgemv.c \ -+ cblas_cgbmv.c \ -+ cblas_chemv.c \ -+ cblas_chbmv.c \ -+ cblas_chpmv.c \ -+ cblas_ctrmv.c \ -+ cblas_ctbmv.c \ -+ cblas_ctpmv.c \ -+ cblas_ctrsv.c \ -+ cblas_ctbsv.c \ -+ cblas_ctpsv.c \ -+ cblas_cgeru.c \ -+ cblas_cgerc.c \ -+ cblas_cher.c \ -+ cblas_cher2.c \ -+ cblas_chpr.c \ -+ cblas_chpr2.c -+ -+CLEV3_SOURCES = \ -+ cblas_cgemm.c \ -+ cblas_csymm.c \ -+ cblas_chemm.c \ -+ cblas_cherk.c \ -+ cblas_cher2k.c \ -+ cblas_ctrmm.c \ -+ cblas_ctrsm.c \ -+ cblas_csyrk.c \ -+ cblas_csyr2k.c -+ -+ZLEV_SOURCES = \ -+ zdotcsub.f \ -+ zdotusub.f \ -+ dzasumsub.f \ -+ dznrm2sub.f \ -+ izamaxsub.f -+ -+ZLEV1_SOURCES = \ -+ cblas_zswap.c \ -+ cblas_zscal.c \ -+ cblas_zdscal.c \ -+ cblas_zcopy.c \ -+ cblas_zaxpy.c \ -+ cblas_zdotu_sub.c \ -+ cblas_zdotc_sub.c \ -+ cblas_dznrm2.c \ -+ cblas_dzasum.c \ -+ cblas_izamax.c -+ -+ZLEV2_SOURCES = \ -+ cblas_zgemv.c \ -+ cblas_zgbmv.c \ -+ cblas_zhemv.c \ -+ cblas_zhbmv.c \ -+ cblas_zhpmv.c \ -+ cblas_ztrmv.c \ -+ cblas_ztbmv.c \ -+ cblas_ztpmv.c \ -+ cblas_ztrsv.c \ -+ cblas_ztbsv.c \ -+ cblas_ztpsv.c \ -+ cblas_zgeru.c \ -+ cblas_zgerc.c \ -+ cblas_zher.c \ -+ cblas_zher2.c \ -+ cblas_zhpr.c \ -+ cblas_zhpr2.c -+ -+ZLEV3_SOURCES = \ -+ cblas_zgemm.c \ -+ cblas_zsymm.c \ -+ cblas_zhemm.c \ -+ cblas_zherk.c \ -+ cblas_zher2k.c \ -+ cblas_ztrmm.c \ -+ cblas_ztrsm.c \ -+ cblas_zsyrk.c \ -+ cblas_zsyr2k.c -+ -+libcblas_la_SOURCES = \ -+ cblas_f77.h \ -+ cblas.h \ -+ $(ERRHAND_SOURCES) \ -+ $(SINGLE_SOURCES) \ -+ $(SLEV_SOURCES) \ -+ $(DLEV_SOURCES) \ -+ $(CLEV_SOURCES) \ -+ $(ZLEV_SOURCES) \ -+ $(SLEV1_SOURCES) \ -+ $(DLEV1_SOURCES) \ -+ $(CLEV1_SOURCES) \ -+ $(ZLEV1_SOURCES) \ -+ $(SLEV2_SOURCES) \ -+ $(DLEV2_SOURCES) \ -+ $(CLEV2_SOURCES) \ -+ $(ZLEV2_SOURCES) \ -+ $(SLEV3_SOURCES) \ -+ $(DLEV3_SOURCES) \ -+ $(CLEV3_SOURCES) \ -+ $(ZLEV3_SOURCES) -+ -+libcblas_la_LIBADD = @BLAS_LIBS@ -+ ---- testing/Makefile.am 1970-01-01 01:00:00.000000000 +0100 -+++ testing/Makefile.am 2007-11-09 17:20:37.000000000 +0000 -@@ -0,0 +1,70 @@ -+TESTS = cblas_tests -+ -+cblas_tests: -+ @install -m0755 cblas_tests.sh cblas_tests -+ -+check_PROGRAMS = \ -+ xscblat1 xdcblat1 xccblat1 xzcblat1 \ -+ xscblat2 xdcblat2 xccblat2 xzcblat2 \ -+ xscblat3 xdcblat3 xccblat3 xzcblat3 -+ -+LDADD = $(top_builddir)/src/libcblas.la @BLAS_LIBS@ -+ -+AM_CPPFLAGS = -I$(top_srcdir)/src -DADD_ -+ -+AUX_SOURCES = \ -+ auxiliary.c \ -+ c_xerbla.c -+ -+xscblat1_SOURCES = \ -+ c_sblas1.c \ -+ c_sblat1.f -+xscblat2_SOURCES = \ -+ c_sblas2.c \ -+ c_s2chke.c \ -+ c_sblat2.f \ -+ $(AUX_SOURCES) -+xscblat3_SOURCES = \ -+ c_sblas3.c \ -+ c_s3chke.c \ -+ c_sblat3.f \ -+ $(AUX_SOURCES) -+xdcblat1_SOURCES = \ -+ c_dblas1.c \ -+ c_dblat1.f -+xdcblat2_SOURCES = \ -+ c_dblas2.c \ -+ c_d2chke.c \ -+ c_dblat2.f \ -+ $(AUX_SOURCES) -+xdcblat3_SOURCES = \ -+ c_dblas3.c \ -+ c_d3chke.c \ -+ c_dblat3.f \ -+ $(AUX_SOURCES) -+xccblat1_SOURCES = \ -+ c_cblas1.c \ -+ c_cblat1.f -+xccblat2_SOURCES = \ -+ c_cblas2.c \ -+ c_c2chke.c \ -+ c_cblat2.f \ -+ $(AUX_SOURCES) -+xccblat3_SOURCES = \ -+ c_cblas3.c \ -+ c_c3chke.c \ -+ c_cblat3.f \ -+ $(AUX_SOURCES) -+xzcblat1_SOURCES = \ -+ c_zblas1.c \ -+ c_zblat1.f -+xzcblat2_SOURCES = \ -+ c_zblas2.c \ -+ c_z2chke.c \ -+ c_zblat2.f \ -+ $(AUX_SOURCES) -+xzcblat3_SOURCES = \ -+ c_zblas3.c \ -+ c_z3chke.c \ -+ c_zblat3.f \ -+ $(AUX_SOURCES) ---- testing/cblas_tests.sh 1970-01-01 01:00:00.000000000 +0100 -+++ testing/cblas_tests.sh 2007-11-09 16:20:41.000000000 +0000 -@@ -0,0 +1,8 @@ -+#!/bin/sh -+ -+for t in x*blat1; do -+ ./${t} -+done -+for t in x*blat{2,3}; do -+ ./${t} < ${t:1:1}in${t:7:1} -+done diff --git a/sci-libs/cblas-reference/files/eselect.cblas.reference b/sci-libs/cblas-reference/files/eselect.cblas.reference deleted file mode 100644 index 62b581860fc7..000000000000 --- a/sci-libs/cblas-reference/files/eselect.cblas.reference +++ /dev/null @@ -1,5 +0,0 @@ -blas/reference/libcblas.so /usr/@LIBDIR@/libcblas.so -blas/reference/libcblas.so.0 /usr/@LIBDIR@/libcblas.so.0 -blas/reference/libcblas.a /usr/@LIBDIR@/libcblas.a -../blas/reference/cblas.pc /usr/@LIBDIR@/pkgconfig/cblas.pc -cblas/cblas.h /usr/include/cblas.h diff --git a/sci-libs/cblas-reference/files/eselect.cblas.reference-r2 b/sci-libs/cblas-reference/files/eselect.cblas.reference-r2 deleted file mode 100644 index b02188c8a9da..000000000000 --- a/sci-libs/cblas-reference/files/eselect.cblas.reference-r2 +++ /dev/null @@ -1,8 +0,0 @@ -blas/reference/libcblas.so /usr/@LIBDIR@/libcblas.so -blas/reference/libcblas.so.3 /usr/@LIBDIR@/libcblas.so.3 -blas/reference/libcblas.a /usr/@LIBDIR@/libcblas.a -../blas/reference/cblas.pc /usr/@LIBDIR@/pkgconfig/cblas.pc -../@LIBDIR@/blas/reference/cblas_test.h /usr/include/cblas_test.h -../@LIBDIR@/blas/reference/cblas_mangling.h /usr/include/cblas_mangling.h -../@LIBDIR@/blas/reference/cblas_f77.h /usr/include/cblas_f77.h -../@LIBDIR@/blas/reference/cblas.h /usr/include/cblas.h diff --git a/sci-libs/cblas-reference/files/lapack-reference-3.6.0-fix-build-system.patch b/sci-libs/cblas-reference/files/lapack-reference-3.6.0-fix-build-system.patch deleted file mode 100644 index a187dac21a12..000000000000 --- a/sci-libs/cblas-reference/files/lapack-reference-3.6.0-fix-build-system.patch +++ /dev/null @@ -1,124 +0,0 @@ - BLAS/CMakeLists.txt | 2 +- - BLAS/blas.pc.in | 6 ++++-- - CBLAS/CMakeLists.txt | 2 +- - CBLAS/cblas.pc.in | 9 ++++++--- - CMakeLists.txt | 2 +- - LAPACKE/CMakeLists.txt | 2 +- - LAPACKE/lapacke.pc.in | 6 ++++-- - lapack.pc.in | 6 ++++-- - 8 files changed, 22 insertions(+), 13 deletions(-) - -diff --git a/BLAS/CMakeLists.txt b/BLAS/CMakeLists.txt -index 45e68e9..56c8354 100644 ---- a/BLAS/CMakeLists.txt -+++ b/BLAS/CMakeLists.txt -@@ -2,7 +2,7 @@ add_subdirectory(SRC) - if(BUILD_TESTING) - add_subdirectory(TESTING) - endif(BUILD_TESTING) --configure_file(${CMAKE_CURRENT_SOURCE_DIR}/blas.pc.in ${CMAKE_CURRENT_BINARY_DIR}/blas.pc) -+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/blas.pc.in ${CMAKE_CURRENT_BINARY_DIR}/blas.pc @ONLY) - install(FILES - ${CMAKE_CURRENT_BINARY_DIR}/blas.pc - DESTINATION ${PKG_CONFIG_DIR} -diff --git a/BLAS/blas.pc.in b/BLAS/blas.pc.in -index 845a25c..7a53ea5 100644 ---- a/BLAS/blas.pc.in -+++ b/BLAS/blas.pc.in -@@ -1,5 +1,7 @@ --prefix=@prefix@ --libdir=@libdir@ -+prefix=@CMAKE_INSTALL_PREFIX@ -+exec_prefix=${prefix} -+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ -+includedir=${prefix}/include - - Name: blas - Description: Basic Linear Algebra Subprograms F77 reference implementations -diff --git a/CBLAS/CMakeLists.txt b/CBLAS/CMakeLists.txt -index 98b481f..8f98b04 100644 ---- a/CBLAS/CMakeLists.txt -+++ b/CBLAS/CMakeLists.txt -@@ -71,7 +71,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/CMAKE/cblas-config-build.cmake.in - ${LAPACK_BINARY_DIR}/cblas-config.cmake @ONLY) - - --configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cblas.pc.in ${CMAKE_CURRENT_BINARY_DIR}/cblas.pc) -+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cblas.pc.in ${CMAKE_CURRENT_BINARY_DIR}/cblas.pc @ONLY) - install(FILES - ${CMAKE_CURRENT_BINARY_DIR}/cblas.pc - DESTINATION ${PKG_CONFIG_DIR} -diff --git a/CBLAS/cblas.pc.in b/CBLAS/cblas.pc.in -index ee20206..14a141e 100644 ---- a/CBLAS/cblas.pc.in -+++ b/CBLAS/cblas.pc.in -@@ -1,9 +1,12 @@ --prefix=@prefix@ --libdir=@libdir@ -+prefix=@CMAKE_INSTALL_PREFIX@ -+exec_prefix=${prefix} -+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ -+includedir=${prefix}/include/@PROFNAME@ - --Name: lapacke -+Name: cblas-reference - Description: C Standard Interface to BLAS Linear Algebra PACKage - Version: @LAPACK_VERSION@ - URL: http://www.netlib.org/lapack/ - Libs: -L${libdir} -lcblas -+Cflags: -I${includedir} - Requires: blas -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ab29bd2..31b878a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -333,7 +333,7 @@ configure_file(${LAPACK_SOURCE_DIR}/CMAKE/lapack-config-build.cmake.in - ${LAPACK_BINARY_DIR}/lapack-config.cmake @ONLY) - - --configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc) -+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc @ONLY) - install(FILES - ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc - DESTINATION ${PKG_CONFIG_DIR} -diff --git a/LAPACKE/CMakeLists.txt b/LAPACKE/CMakeLists.txt -index 008f24c..d8c4cb0 100644 ---- a/LAPACKE/CMakeLists.txt -+++ b/LAPACKE/CMakeLists.txt -@@ -65,7 +65,7 @@ if(BUILD_TESTING) - endif(BUILD_TESTING) - - --configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapacke.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapacke.pc) -+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapacke.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapacke.pc @ONLY) - install(FILES - ${CMAKE_CURRENT_BINARY_DIR}/lapacke.pc - DESTINATION ${PKG_CONFIG_DIR} -diff --git a/LAPACKE/lapacke.pc.in b/LAPACKE/lapacke.pc.in -index 75e6871..ce5201b 100644 ---- a/LAPACKE/lapacke.pc.in -+++ b/LAPACKE/lapacke.pc.in -@@ -1,5 +1,7 @@ --prefix=@prefix@ --libdir=@libdir@ -+prefix=@CMAKE_INSTALL_PREFIX@ -+exec_prefix=${prefix} -+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ -+includedir=${prefix}/include - - Name: lapacke - Description: C Standard Interface to LAPACK Linear Algebra PACKage -diff --git a/lapack.pc.in b/lapack.pc.in -index d34c870..0d0750f 100644 ---- a/lapack.pc.in -+++ b/lapack.pc.in -@@ -1,5 +1,7 @@ --prefix=@prefix@ --libdir=@libdir@ -+prefix=@CMAKE_INSTALL_PREFIX@ -+exec_prefix=${prefix} -+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ -+includedir=${prefix}/include - - Name: lapack - Description: FORTRAN reference implementation of LAPACK Linear Algebra PACKage diff --git a/sci-libs/cblas-reference/files/lapack-reference-3.7.0-fix-build-system.patch b/sci-libs/cblas-reference/files/lapack-reference-3.7.0-fix-build-system.patch deleted file mode 100644 index 70f7cb0ee926..000000000000 --- a/sci-libs/cblas-reference/files/lapack-reference-3.7.0-fix-build-system.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff --git a/BLAS/blas.pc.in b/BLAS/blas.pc.in -index 7fd6f1e..e52f3ad 100644 ---- a/BLAS/blas.pc.in -+++ b/BLAS/blas.pc.in -@@ -1,5 +1,7 @@ --prefix=@prefix@ --libdir=@libdir@ -+prefix=@CMAKE_INSTALL_PREFIX@ -+exec_prefix=${prefix} -+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ -+includedir=${prefix}/include - - Name: BLAS - Description: FORTRAN reference implementation of BLAS Basic Linear Algebra Subprograms -diff --git a/CBLAS/cblas.pc.in b/CBLAS/cblas.pc.in -index 4a938fe..311aed9 100644 ---- a/CBLAS/cblas.pc.in -+++ b/CBLAS/cblas.pc.in -@@ -1,5 +1,7 @@ --prefix=@prefix@ --libdir=@libdir@ -+prefix=@CMAKE_INSTALL_PREFIX@ -+exec_prefix=${prefix} -+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ -+includedir=${prefix}/include - - Name: CBLAS - Description: C Standard Interface to BLAS Basic Linear Algebra Subprograms -diff --git a/LAPACKE/lapacke.pc.in b/LAPACKE/lapacke.pc.in -index 028f8da..dc092b1 100644 ---- a/LAPACKE/lapacke.pc.in -+++ b/LAPACKE/lapacke.pc.in -@@ -1,5 +1,7 @@ --prefix=@prefix@ --libdir=@libdir@ -+prefix=@CMAKE_INSTALL_PREFIX@ -+exec_prefix=${prefix} -+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ -+includedir=${prefix}/include - - Name: LAPACKE - Description: C Standard Interface to LAPACK Linear Algebra PACKage -diff --git a/lapack.pc.in b/lapack.pc.in -index 878efc2..2cca4c2 100644 ---- a/lapack.pc.in -+++ b/lapack.pc.in -@@ -1,5 +1,7 @@ --prefix=@prefix@ --libdir=@libdir@ -+prefix=@CMAKE_INSTALL_PREFIX@ -+exec_prefix=${prefix} -+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ -+includedir=${prefix}/include - - Name: LAPACK - Description: FORTRAN reference implementation of LAPACK Linear Algebra PACKage -- cgit v1.2.3