diff options
author | Michael Mair-Keimberger (asterix) <m.mairkeimberger@gmail.com> | 2017-01-29 10:15:42 +0100 |
---|---|---|
committer | David Seifert <soap@gentoo.org> | 2017-01-29 21:09:39 +0100 |
commit | 83897011293c763f4bade9ad27e6e81db06c3e7e (patch) | |
tree | 366b0fb1798a912ca331f9ca8b5151498e5608b1 /sci-libs/punc | |
parent | sci-libs/pgplot: remove unused patch (diff) | |
download | gentoo-83897011293c763f4bade9ad27e6e81db06c3e7e.tar.gz gentoo-83897011293c763f4bade9ad27e6e81db06c3e7e.tar.bz2 gentoo-83897011293c763f4bade9ad27e6e81db06c3e7e.zip |
sci-libs/punc: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/3709
Diffstat (limited to 'sci-libs/punc')
-rw-r--r-- | sci-libs/punc/files/0.2_p1-configure.patch | 49 | ||||
-rw-r--r-- | sci-libs/punc/files/0.2_p1-underlinking.patch | 144 | ||||
-rw-r--r-- | sci-libs/punc/files/1.4-header.patch | 26 | ||||
-rw-r--r-- | sci-libs/punc/files/1.4-linking.patch | 158 | ||||
-rw-r--r-- | sci-libs/punc/files/punc-0.2_p1-libdir.patch | 15 |
5 files changed, 0 insertions, 392 deletions
diff --git a/sci-libs/punc/files/0.2_p1-configure.patch b/sci-libs/punc/files/0.2_p1-configure.patch deleted file mode 100644 index 7f4ce9788073..000000000000 --- a/sci-libs/punc/files/0.2_p1-configure.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 633803d..279fad6 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -348,7 +348,7 @@ else - AC_CHECK_LIB(blas,dscal_, - [blas_use="yes";blas_lib="${blas_lib_path}-lblas"], - [blas_use="";blas_lib=""], -- [${blas_lib_path}-lblas -lvf2c]) -+ [${blas_lib_path}-lblas]) - if test -z "${blas_use}"; then - AC_MSG_RESULT([** BLAS library missing ...will BUILD **]) - blas="blas"; -@@ -410,7 +410,7 @@ else - AC_CHECK_LIB(lapack,dsysv_, - [lapack_use="yes";lapack_lib="${lapack_lib_path}-llapack"], - [lapack_use="";lapack_lib=""], -- [${lapack_lib_path}-llapack ${blas_lib} -lvf2c]) -+ [${lapack_lib_path}-llapack ${blas_lib}]) - if test -z "${lapack_use}"; then - AC_MSG_RESULT([** LAPACK library missing ...will BUILD **]) - lapack="lapack"; -@@ -472,7 +472,7 @@ else - AC_CHECK_LIB(superlu,Destroy_SuperMatrix_Store, - [superlu_use="yes";superlu_lib="${superlu_lib_path}-lsuperlu"], - [superlu_use="";superlu_lib=""], -- [${superlu_lib_path}-lsuperlu ${lapack_lib} ${blas_lib} -lvf2c]) -+ [${superlu_lib_path}-lsuperlu ${lapack_lib} ${blas_lib}]) - if test -z "${superlu_use}"; then - AC_MSG_RESULT([** SUPERLU library missing ...will BUILD **]) - superlu="superlu"; -@@ -534,7 +534,7 @@ else - AC_CHECK_LIB(arpack,dsgets_, - [arpack_use="yes";arpack_lib="${arpack_lib_path}-larpack"], - [arpack_use="";arpack_lib=""], -- [${arpack_lib_path}-larpack ${blas_lib} -lvf2c]) -+ [${arpack_lib_path}-larpack ${blas_lib}]) - if test -z "${arpack_use}"; then - AC_MSG_RESULT([** ARPACK library missing ...will BUILD **]) - arpack="arpack"; -@@ -658,7 +658,7 @@ else - AC_CHECK_LIB(pmg,buildg_, - [pmg_use="yes";pmg_lib="${pmg_lib_path}-lpmg"], - [pmg_use="";pmg_lib=""], -- [${pmg_lib_path}-lpmg ${blas_lib} -lvf2c]) -+ [${pmg_lib_path}-lpmg ${blas_lib}]) - if test -z "${pmg_use}"; then - AC_MSG_RESULT([** PMG library missing ...will BUILD **]) - pmg="pmg"; diff --git a/sci-libs/punc/files/0.2_p1-underlinking.patch b/sci-libs/punc/files/0.2_p1-underlinking.patch deleted file mode 100644 index f83c93f1edc5..000000000000 --- a/sci-libs/punc/files/0.2_p1-underlinking.patch +++ /dev/null @@ -1,144 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 633803d..89a9fb4 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -50,7 +50,8 @@ dnl 2. checks for programs - AC_LANG_C - AC_PROG_CC - AC_PROG_CPP --AC_DISABLE_SHARED -+AC_PROG_F77 -+AC_F77_LIBRARY_LDFLAGS - AM_PROG_LIBTOOL - - dnl 3. checks for libraries -@@ -348,7 +349,7 @@ else - AC_CHECK_LIB(blas,dscal_, - [blas_use="yes";blas_lib="${blas_lib_path}-lblas"], - [blas_use="";blas_lib=""], -- [${blas_lib_path}-lblas -lvf2c]) -+ [${blas_lib_path}-lblas]) - if test -z "${blas_use}"; then - AC_MSG_RESULT([** BLAS library missing ...will BUILD **]) - blas="blas"; -@@ -410,7 +411,7 @@ else - AC_CHECK_LIB(lapack,dsysv_, - [lapack_use="yes";lapack_lib="${lapack_lib_path}-llapack"], - [lapack_use="";lapack_lib=""], -- [${lapack_lib_path}-llapack ${blas_lib} -lvf2c]) -+ [${lapack_lib_path}-llapack ${blas_lib}]) - if test -z "${lapack_use}"; then - AC_MSG_RESULT([** LAPACK library missing ...will BUILD **]) - lapack="lapack"; -@@ -472,7 +473,7 @@ else - AC_CHECK_LIB(superlu,Destroy_SuperMatrix_Store, - [superlu_use="yes";superlu_lib="${superlu_lib_path}-lsuperlu"], - [superlu_use="";superlu_lib=""], -- [${superlu_lib_path}-lsuperlu ${lapack_lib} ${blas_lib} -lvf2c]) -+ [${superlu_lib_path}-lsuperlu ${lapack_lib} ${blas_lib}]) - if test -z "${superlu_use}"; then - AC_MSG_RESULT([** SUPERLU library missing ...will BUILD **]) - superlu="superlu"; -@@ -534,7 +535,7 @@ else - AC_CHECK_LIB(arpack,dsgets_, - [arpack_use="yes";arpack_lib="${arpack_lib_path}-larpack"], - [arpack_use="";arpack_lib=""], -- [${arpack_lib_path}-larpack ${blas_lib} -lvf2c]) -+ [${arpack_lib_path}-larpack ${blas_lib}]) - if test -z "${arpack_use}"; then - AC_MSG_RESULT([** ARPACK library missing ...will BUILD **]) - arpack="arpack"; -@@ -658,7 +659,7 @@ else - AC_CHECK_LIB(pmg,buildg_, - [pmg_use="yes";pmg_lib="${pmg_lib_path}-lpmg"], - [pmg_use="";pmg_lib=""], -- [${pmg_lib_path}-lpmg ${blas_lib} -lvf2c]) -+ [${pmg_lib_path}-lpmg ${blas_lib}]) - if test -z "${pmg_use}"; then - AC_MSG_RESULT([** PMG library missing ...will BUILD **]) - pmg="pmg"; -@@ -846,10 +847,6 @@ AC_OUTPUT([ - src/base/Makefile - - src/vf2c/Makefile -- src/blas/Makefile -- src/lapack/Makefile -- src/superlu/Makefile -- src/arpack/Makefile - src/cgcode/Makefile - src/pmg/Makefile - -diff --git a/src/aaa_lib/Makefile.am b/src/aaa_lib/Makefile.am -index e338300..903dd2f 100644 ---- a/src/aaa_lib/Makefile.am -+++ b/src/aaa_lib/Makefile.am -@@ -92,11 +92,11 @@ libdir = ${prefix}/lib/${fetk_cpu_vendor_os} - lib_LTLIBRARIES = libpunc.la ${LIBVF2C} ${LIBBLAS} ${LIBLAPACK} ${LIBSUPERLU} ${LIBARPACK} ${LIBCGCODE} ${LIBPMG} - - libpunc_la_SOURCES = --libpunc_la_LIBADD = ${BASE_LIBS} -+libpunc_la_LIBADD = ${BASE_LIBS} -lm - libpunc_la_LDFLAGS = -version-info ${FETK_VERSION} - - libvf2c_la_SOURCES = --libvf2c_la_LIBADD = ${VF2C_LIBS} -+libvf2c_la_LIBADD = ${VF2C_LIBS} -lgfortran -lf2c -lm - libvf2c_la_LDFLAGS = -version-info ${FETK_VERSION} - - libblas_la_SOURCES = -@@ -108,7 +108,7 @@ liblapack_la_LIBADD = ${LAPACK_LIBS} - liblapack_la_LDFLAGS = -version-info ${FETK_VERSION} - - libsuperlu_la_SOURCES = --libsuperlu_la_LIBADD = ${SUPERLU_LIBS} -+libsuperlu_la_LIBADD = ${SUPERLU_LIBS} - libsuperlu_la_LDFLAGS = -version-info ${FETK_VERSION} - - libarpack_la_SOURCES = -@@ -116,10 +116,9 @@ libarpack_la_LIBADD = ${ARPACK_LIBS} - libarpack_la_LDFLAGS = -version-info ${FETK_VERSION} - - libcgcode_la_SOURCES = --libcgcode_la_LIBADD = ${CGCODE_LIBS} -+libcgcode_la_LIBADD = ${CGCODE_LIBS} ${VF2C_LIBS} -lblas -lgfortran -lm - libcgcode_la_LDFLAGS = -version-info ${FETK_VERSION} - - libpmg_la_SOURCES = --libpmg_la_LIBADD = ${PMG_LIBS} -+libpmg_la_LIBADD = ${VF2C_LIBS} ${PMG_LIBS} ${BASE_LIBS} -lgfortran -lf2c -lmaloc -lm - libpmg_la_LDFLAGS = -version-info ${FETK_VERSION} -- -diff --git a/src/pmg/Makefile.am b/src/pmg/Makefile.am -index 6f3108d..154aeba 100644 ---- a/src/pmg/Makefile.am -+++ b/src/pmg/Makefile.am -@@ -38,11 +38,12 @@ always_built_SUBDIRS = - SUBDIRS = $(always_built_SUBDIRS) . - THISLIB = pmg - --noinst_LTLIBRARIES = libpmg.la -+lib_LTLIBRARIES = libpmg.la - --SRC = buildAd.c buildBd.c buildGd.c buildPd.c cgd.c cgmgd.c cgmgdrvd.c gsd.c matvecd.c mblasd.c mgcsd.c mgdrvd.c mgfasd.c mgsubd.c mikpckd.c mlinpckd.c ncgd.c ncgdrvd.c newdrvd.c newtond.c ngsd.c ngsdrvd.c ninterpd.c nrchd.c nrchdrvd.c nsmoothd.c nsord.c nsordrvd.c nwjd.c nwjdrvd.c powerd.c rchd.c smoothd.c sord.c wjd.c -+SRC = buildAd.c buildBd.c buildGd.c buildPd.c cgd.c cgmgd.c cgmgdrvd.c gsd.c matvecd.c mblasd.c mgcsd.c mgdrvd.c mgfasd.c mgsubd.c mikpckd.c mlinpckd.c ncgd.c ncgdrvd.c newdrvd.c newtond.c ngsd.c ngsdrvd.c ninterpd.c nrchd.c nrchdrvd.c nsmoothd.c nsord.c nsordrvd.c nwjd.c nwjdrvd.c powerd.c rchd.c smoothd.c sord.c wjd.c secd.c pded.f - - libpmg_la_SOURCES = ${SRC} -+libpmg_la_LIBADD = -lf2c ../vf2c/libvf2c.la - INCLUDES = @maloc_inc@ - AM_CFLAGS = @profile@ @pedantic_ansi@ - -diff --git a/src/vf2c/main.c b/src/vf2c/main.c -index 4539749..6577570 100644 ---- a/src/vf2c/main.c -+++ b/src/vf2c/main.c -@@ -134,7 +134,9 @@ f_init(); - #ifndef NO_ONEXIT - ONEXIT(f_exit); - #endif --MAIN__(); -+int MAIN__( ) -+ { return(0); -+} - #ifdef NO_ONEXIT - f_exit(); - #endif diff --git a/sci-libs/punc/files/1.4-header.patch b/sci-libs/punc/files/1.4-header.patch deleted file mode 100644 index e0b2d31c924d..000000000000 --- a/sci-libs/punc/files/1.4-header.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/src/vf2c/punc/vsuperlu.h b/src/vf2c/punc/vsuperlu.h -index d0e7fb3..cb7977a 100644 ---- a/src/vf2c/punc/vsuperlu.h -+++ b/src/vf2c/punc/vsuperlu.h -@@ -34,7 +34,7 @@ - - #include <punc/punc_base.h> - --#include <punc/slu_ddefs.h> -+#include <superlu/slu_ddefs.h> - - #endif /* _VSUPERLU_H_ */ - -diff --git a/src/vf2c/punc/vumfpack.h b/src/vf2c/punc/vumfpack.h -index 06896f3..e90aca6 100644 ---- a/src/vf2c/punc/vumfpack.h -+++ b/src/vf2c/punc/vumfpack.h -@@ -34,7 +34,7 @@ - - #include <punc/punc_base.h> - --#include <punc/umfpack.h> -+#include <umfpack.h> - - #endif /* _VUMFPACK_H_ */ - diff --git a/sci-libs/punc/files/1.4-linking.patch b/sci-libs/punc/files/1.4-linking.patch deleted file mode 100644 index bdd19e7c0236..000000000000 --- a/sci-libs/punc/files/1.4-linking.patch +++ /dev/null @@ -1,158 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index fcff075..f1262da 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -48,7 +48,8 @@ dnl 2. checks for programs - AC_LANG_C - AC_PROG_CC - AC_PROG_CPP --AC_DISABLE_SHARED -+AC_PROG_F77 -+AC_F77_LIBRARY_LDFLAGS - AM_PROG_LIBTOOL - - dnl 3. checks for libraries -@@ -358,7 +359,7 @@ else - AC_CHECK_LIB(blas,dscal_, - [blas_use="yes";blas_lib="${blas_lib_path}-lblas"], - [blas_use="";blas_lib=""], -- [${blas_lib_path}-lblas -lvf2c]) -+ [${blas_lib_path}-lblas]) - if test -z "${blas_use}"; then - AC_MSG_RESULT([** BLAS library missing ...will BUILD **]) - blas="blas"; -@@ -413,7 +414,7 @@ else - AC_CHECK_LIB(lapack,dsysv_, - [lapack_use="yes";lapack_lib="${lapack_lib_path}-llapack"], - [lapack_use="";lapack_lib=""], -- [${lapack_lib_path}-llapack ${blas_lib} -lvf2c]) -+ [${lapack_lib_path}-llapack ${blas_lib}]) - if test -z "${lapack_use}"; then - AC_MSG_RESULT([** LAPACK library missing ...will BUILD **]) - lapack="lapack"; -@@ -465,10 +466,10 @@ else - LDFLAGS_SAVE=${LDFLAGS}; - LDFLAGS=${amd_lib_path}; - amd_use=""; -- AC_CHECK_LIB(amd,AMD_order, -+ AC_CHECK_LIB(amd,amd_order, - [amd_use="yes";amd_lib="${amd_lib_path}-lamd"], - [amd_use="";amd_lib=""], -- [${amd_lib_path}-lamd ${blas_lib} -lvf2c]) -+ [${amd_lib_path}-lamd ${blas_lib}]) - if test -z "${amd_use}"; then - AC_MSG_RESULT([** AMD library missing ...will BUILD **]) - amd="amd"; -@@ -520,10 +521,10 @@ else - LDFLAGS_SAVE=${LDFLAGS}; - LDFLAGS=${umfpack_lib_path}; - umfpack_use=""; -- AC_CHECK_LIB(umfpack,UMFPACK_numeric, -+ AC_CHECK_LIB(umfpack,umfpack_di_numeric, - [umfpack_use="yes";umfpack_lib="${umfpack_lib_path}-lumfpack"], - [umfpack_use="";umfpack_lib=""], -- [${umfpack_lib_path}-lumfpack ${blas_lib} -lvf2c]) -+ [${umfpack_lib_path}-lumfpack ${blas_lib}]) - if test -z "${umfpack_use}"; then - AC_MSG_RESULT([** UMFPACK library missing ...will BUILD **]) - umfpack="umfpack"; -@@ -578,7 +579,7 @@ else - AC_CHECK_LIB(superlu,Destroy_SuperMatrix_Store, - [superlu_use="yes";superlu_lib="${superlu_lib_path}-lsuperlu"], - [superlu_use="";superlu_lib=""], -- [${superlu_lib_path}-lsuperlu ${lapack_lib} ${blas_lib} -lvf2c]) -+ [${superlu_lib_path}-lsuperlu ${lapack_lib} ${blas_lib}]) - if test -z "${superlu_use}"; then - AC_MSG_RESULT([** SUPERLU library missing ...will BUILD **]) - superlu="superlu"; -@@ -633,7 +634,7 @@ else - AC_CHECK_LIB(arpack,dsgets_, - [arpack_use="yes";arpack_lib="${arpack_lib_path}-larpack"], - [arpack_use="";arpack_lib=""], -- [${arpack_lib_path}-larpack ${blas_lib} -lvf2c]) -+ [${arpack_lib_path}-larpack ${blas_lib}]) - if test -z "${arpack_use}"; then - AC_MSG_RESULT([** ARPACK library missing ...will BUILD **]) - arpack="arpack"; -@@ -688,7 +689,7 @@ else - AC_CHECK_LIB(cgcode,scgdrv_, - [cgcode_use="yes";cgcode_lib="${cgcode_lib_path}-lcgcode"], - [cgcode_use="";cgcode_lib=""], -- [${cgcode_lib_path}-lcgcode ${blas_lib} -lvf2c]) -+ [${cgcode_lib_path}-lcgcode ${blas_lib}]) - if test -z "${cgcode_use}"; then - AC_MSG_RESULT([** CGCODE library missing ...will BUILD **]) - cgcode="cgcode"; -@@ -743,7 +744,7 @@ else - AC_CHECK_LIB(pmg,buildg_, - [pmg_use="yes";pmg_lib="${pmg_lib_path}-lpmg"], - [pmg_use="";pmg_lib=""], -- [${pmg_lib_path}-lpmg ${blas_lib} -lvf2c]) -+ [${pmg_lib_path}-lpmg ${blas_lib}]) - if test -z "${pmg_use}"; then - AC_MSG_RESULT([** PMG library missing ...will BUILD **]) - pmg="pmg"; -@@ -982,13 +983,6 @@ AC_OUTPUT([ - src/base/Makefile - - src/vf2c/Makefile -- src/blas/Makefile -- src/lapack/Makefile -- src/amd/Makefile -- src/umfpack/Makefile -- src/superlu/Makefile -- src/arpack/Makefile -- src/cgcode/Makefile - src/pmg/Makefile - - src/aaa_inc/Makefile -diff --git a/src/aaa_lib/Makefile.am b/src/aaa_lib/Makefile.am -index 2e17d41..3cbb9b5 100644 ---- a/src/aaa_lib/Makefile.am -+++ b/src/aaa_lib/Makefile.am -@@ -102,15 +102,14 @@ else - LIBPMG = - endif - --libdir = ${prefix}/lib - lib_LTLIBRARIES = libpunc.la ${LIBVF2C} ${LIBBLAS} ${LIBLAPACK} ${LIBAMD} ${LIBUMFPACK} ${LIBSUPERLU} ${LIBARPACK} ${LIBCGCODE} ${LIBPMG} - - libpunc_la_SOURCES = --libpunc_la_LIBADD = ${BASE_LIBS} -+libpunc_la_LIBADD = ${BASE_LIBS} -lm - libpunc_la_LDFLAGS = -version-info ${FETK_VERSION} - - libvf2c_la_SOURCES = --libvf2c_la_LIBADD = ${VF2C_LIBS} -+libvf2c_la_LIBADD = ${VF2C_LIBS} -lgfortran -lf2c -lm - libvf2c_la_LDFLAGS = -version-info ${FETK_VERSION} - - libblas_la_SOURCES = -@@ -142,6 +141,6 @@ libcgcode_la_LIBADD = ${CGCODE_LIBS} - libcgcode_la_LDFLAGS = -version-info ${FETK_VERSION} - - libpmg_la_SOURCES = --libpmg_la_LIBADD = ${PMG_LIBS} -+libpmg_la_LIBADD = ${PMG_LIBS} ${BASE_LIBS} -lgfortran -lf2c -lmaloc -lm - libpmg_la_LDFLAGS = -version-info ${FETK_VERSION} - -diff --git a/src/pmg/Makefile.am b/src/pmg/Makefile.am -index cae9324..8eb0ba0 100644 ---- a/src/pmg/Makefile.am -+++ b/src/pmg/Makefile.am -@@ -38,13 +38,14 @@ always_built_SUBDIRS = - SUBDIRS = $(always_built_SUBDIRS) . - THISLIB = pmg - --noinst_LTLIBRARIES = libpmg.la -+lib_LTLIBRARIES = libpmg.la - - SRC = buildAd.c buildBd.c buildGd.c buildPd.c cgd.c cgmgd.c cgmgdrvd.c gsd.c matvecd.c mblasd.c mgcsd.c mgdrvd.c mgfasd.c mgsubd.c mikpckd.c mlinpckd.c ncgd.c ncgdrvd.c newdrvd.c newtond.c ngsd.c ngsdrvd.c ninterpd.c nrchd.c nrchdrvd.c nsmoothd.c nsord.c nsordrvd.c nwjd.c nwjdrvd.c powerd.c rchd.c smoothd.c sord.c wjd.c - - libpmg_la_SOURCES = ${SRC} - INCLUDES = @maloc_inc@ - AM_CFLAGS = @profile@ @pedantic_ansi@ -+libpmg_la_LIBADD = -lf2c - - all-local: - # -cp -p ${top_srcdir}/src/${THISLIB}/punc/*.h ../aaa_inc/punc/. diff --git a/sci-libs/punc/files/punc-0.2_p1-libdir.patch b/sci-libs/punc/files/punc-0.2_p1-libdir.patch deleted file mode 100644 index b8a973b3aa2d..000000000000 --- a/sci-libs/punc/files/punc-0.2_p1-libdir.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: punc/src/aaa_lib/Makefile.am -=================================================================== ---- punc.orig/src/aaa_lib/Makefile.am -+++ punc/src/aaa_lib/Makefile.am -@@ -88,8 +88,8 @@ else - LIBPMG = - endif - --libdir = ${prefix}/lib/${fetk_cpu_vendor_os} --lib_LTLIBRARIES = libpunc.la ${LIBVF2C} ${LIBBLAS} ${LIBLAPACK} ${LIBSUPERLU} ${LIBARPACK} ${LIBCGCODE} ${LIBPMG} -+mylibdir = ${libdir}/${fetk_cpu_vendor_os} -+mylib_LTLIBRARIES = libpunc.la ${LIBVF2C} ${LIBBLAS} ${LIBLAPACK} ${LIBSUPERLU} ${LIBARPACK} ${LIBCGCODE} ${LIBPMG} - - libpunc_la_SOURCES = - libpunc_la_LIBADD = ${BASE_LIBS} |