[gentoo-commits] proj/sci:master commit in: sci-libs/gsl/files/, sci-libs/gsl/
commit: 0ac46aea43d5ac971a71263868ffe2940cc58822
Author: Aisha Tammy aisha cc>
AuthorDate: Tue Sep 22 12:10:50 2020 +
Commit: Aisha Tammy aisha cc>
CommitDate: Tue Sep 22 12:10:50 2020 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=0ac46aea
sci-libs/gsl: drop package
present in ::gentoo
Package-Manager: Portage-3.0.7, Repoman-3.0.1
Signed-off-by: Aisha Tammy aisha.cc>
sci-libs/gsl/files/gsl-1.16-cblas-external.patch | 294
sci-libs/gsl/files/gsl-2.1-cblas-external.patch | 326 ---
sci-libs/gsl/files/gsl-2.3-cblas-external.patch | 101 ---
sci-libs/gsl/gsl-1.16-r2.ebuild | 64 -
sci-libs/gsl/gsl-2.1.ebuild | 72 -
sci-libs/gsl/gsl-2.3.ebuild | 74 -
sci-libs/gsl/gsl-2.4.ebuild | 78 --
sci-libs/gsl/gsl-2.5.ebuild | 78 --
sci-libs/gsl/metadata.xml| 25 --
9 files changed, 1112 deletions(-)
diff --git a/sci-libs/gsl/files/gsl-1.16-cblas-external.patch
b/sci-libs/gsl/files/gsl-1.16-cblas-external.patch
deleted file mode 100644
index c29ef5294..0
--- a/sci-libs/gsl/files/gsl-1.16-cblas-external.patch
+++ /dev/null
@@ -1,294 +0,0 @@
-diff -Nur gsl-1.16.orig/ax_cblas.m4 gsl-1.16/ax_cblas.m4
gsl-1.16.orig/ax_cblas.m4 1969-12-31 16:00:00.0 -0800
-+++ gsl-1.16/ax_cblas.m4 2013-08-19 15:48:54.376300825 -0700
-@@ -0,0 +1,69 @@
-+AC_DEFUN([AX_CBLAS],[
-+
-+ ext_cblas=no
-+ ext_cblas_libs="-lcblas"
-+ ext_cblas_cflags=""
-+
-+ AC_ARG_WITH(cblas-external,
-+ [AS_HELP_STRING([--with-cblas-external],
-+ [Use external CBLAS library (default is no)])],
-+ [with_ext_cblas=$withval],
-+ [with_ext_cblas=no])
-+
-+ case $with_ext_cblas in
-+ no) ext_cblas=no ;;
-+ yes) ext_cblas=yes ;;
-+ -* | */* | *.a | *.so | *.so.* | *.o)
-+ ext_cblas=yes
-+ ext_cblas_libs="$with_cblas" ;;
-+ *) ext_cblas=yes
-+ ext_cblas_libs="-l$with_cblas" ;;
-+ esac
-+
-+ AC_ARG_WITH(cblas-external-libs,
-+ [AS_HELP_STRING([--with-cblas-external-libs=],
-+ [External cblas libraries to link with (default is
"$ext_cblas_libs")])],
-+ [ext_cblas_libs=$withval],
-+ [])
-+
-+ AC_ARG_WITH(cblas-external-cflags,
-+ [AS_HELP_STRING([--with-cblas-external-cflags=],
-+ [Pre-processing flags to compile with external cblas
("-I")])],
-+ [ext_cblas_cflags=$withval],
-+ [])
-+
-+ if test x$ext_cblas != xno; then
-+ if test "x$CBLAS_LIBS" = x; then
-+ CBLAS_LIBS="$ext_cblas_libs"
-+ fi
-+ if test "x$CBLAS_CFLAGS" = x; then
-+ CBLAS_CFLAGS="$ext_cblas_cflags"
-+ fi
-+
-+ CFLAGS_sav="$CFLAGS"
-+ CFLAGS="$CFLAGS $CBLAS_CFLAGS"
-+ AC_CHECK_HEADER(cblas.h, ,
-+ [AC_MSG_ERROR([
-+ *** Header file cblas.h not found.
-+ *** If you installed cblas header in a non standard place,
-+ *** specify its install prefix using the following option
-+ *** --with-cblas-external-cflags="-I"])
-+ ])
-+ CFLAGS="$CFLAGS_sav"
-+
-+ LIBS_sav="$LIBS"
-+ LIBS="$LIBS $CBLAS_LIBS -lm"
-+ AC_MSG_CHECKING([for cblas_sgemm in $CBLAS_LIBS])
-+ AC_TRY_LINK_FUNC(cblas_sgemm, [ext_cblas=yes],
-+ [AC_MSG_ERROR([
-+ *** Linking with cblas with $LIBS failed.
-+ *** If you installed cblas library in a non standard
place,
-+ *** specify its install prefix using the following option
-+ *** --with-cblas-external-libs="-L -l"])
-+ ])
-+ AC_MSG_RESULT($ext_cblas)
-+ LIBS="$LIBS_sav"
-+ AC_SUBST([CBLAS_CFLAGS])
-+ AC_SUBST([CBLAS_LIBS])
-+ fi
-+])
-diff -Nur gsl-1.16.orig/bspline/Makefile.am gsl-1.16/bspline/Makefile.am
gsl-1.16.orig/bspline/Makefile.am 2013-07-17 13:04:26.0 -0700
-+++ gsl-1.16/bspline/Makefile.am 2013-08-19 15:25:27.728497742 -0700
-@@ -12,6 +12,6 @@
-
- TESTS = $(check_PROGRAMS)
-
--test_LDADD = libgslbspline.la ../linalg/libgsllinalg.la
../permutation/libgslpermutation.la ../blas/libgslblas.la
../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la
../complex/libgslcomplex.la ../cblas/libgslcblas.la
../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la
../sys/libgslsys.la ../utils/libutils.la ../statistics/libgslstatistics.la
-+test_LDADD = libgslbspline.la ../linalg/libgsllinalg.la
../permutation/libgslpermutation.la ../blas/libgslblas.la
../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la
../complex/libgslcomplex.la @CBLAS_LINK_LIBS@ ../ieee-utils/libgslieeeutils.la
../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la
../utils/libutils.la ../statistics/libgslstatistics.la
-
- test_SOURCES
[gentoo-commits] proj/sci:master commit in: sci-libs/gsl/files/, sci-libs/gsl/
commit: 69a4b2c57b5bcbb06dd7b6bd6f182abfe936fa6c Author: François Bissey canterbury ac nz> AuthorDate: Sat Mar 4 04:26:28 2017 + Commit: Marius Brehler linux sungazer de> CommitDate: Tue Mar 7 18:59:18 2017 + URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=69a4b2c5 sci-libs/gsl: remove int64 support since it doesn't exist upstream. Bump the ebuild as the current one produce broken install for the gslcblas alternative. Package-Manager: portage-2.3.3 sci-libs/gsl/files/gsl-2.3-cblas-external.patch | 1402 +-- sci-libs/gsl/gsl-2.1-r1.ebuild | 82 ++ sci-libs/gsl/gsl-2.1.ebuild | 78 -- sci-libs/gsl/gsl-2.3-r1.ebuild | 84 ++ sci-libs/gsl/gsl-2.3.ebuild | 78 -- sci-libs/gsl/metadata.xml |1 - 6 files changed, 175 insertions(+), 1550 deletions(-) diff --git a/sci-libs/gsl/files/gsl-2.3-cblas-external.patch b/sci-libs/gsl/files/gsl-2.3-cblas-external.patch index 7e12b370b..38b25aacc 100644 --- a/sci-libs/gsl/files/gsl-2.3-cblas-external.patch +++ b/sci-libs/gsl/files/gsl-2.3-cblas-external.patch @@ -1,36 +1,3 @@ - Makefile.am | 8 +- - Makefile.am.porig | 66 - ax_cblas.m4 | 69 + - bspline/Makefile.am | 2 +- - bspline/Makefile.am.porig | 17 ++ - configure.ac| 10 + - configure.ac.porig | 647 - eigen/Makefile.am | 2 +- - eigen/Makefile.am.porig | 18 ++ - gsl-config.in | 4 +- - gsl-config.in.porig | 80 + - gsl.pc.in | 2 +- - gsl.pc.in.porig | 11 + - interpolation/Makefile.am | 2 +- - interpolation/Makefile.am.porig | 18 ++ - linalg/Makefile.am | 2 +- - linalg/Makefile.am.porig| 16 + - multifit/Makefile.am| 4 +- - multifit/Makefile.am.porig | 74 + - multimin/Makefile.am| 4 +- - multimin/Makefile.am.porig | 20 ++ - multiroots/Makefile.am | 2 +- - multiroots/Makefile.am.porig| 19 ++ - ode-initval/Makefile.am | 2 +- - ode-initval/Makefile.am.porig | 18 ++ - poly/Makefile.am| 2 +- - poly/Makefile.am.porig | 17 ++ - specfunc/Makefile.am| 2 +- - specfunc/Makefile.am.porig | 19 ++ - wavelet/Makefile.am | 2 +- - wavelet/Makefile.am.porig | 17 ++ - 31 files changed, 1157 insertions(+), 19 deletions(-) - diff --git a/Makefile.am b/Makefile.am index c522001..4513bc8 100644 --- a/Makefile.am @@ -66,188 +33,6 @@ index c522001..4513bc8 100644 -e 's|@LIBS[@]|$(LIBS)|g' \ -e 's|@VERSION[@]|$(VERSION)|g' -diff --git a/Makefile.am.porig b/Makefile.am.porig -new file mode 100644 -index 000..c522001 /dev/null -+++ b/Makefile.am.porig -@@ -0,0 +1,66 @@ -+## Process this file with automake to produce Makefile.in -+ -+# AUTOMAKE_OPTIONS = readme-alpha -+ -+SUBDIRS = gsl utils sys test err const complex cheb block vector matrix permutation combination multiset sort ieee-utils cblas blas linalg eigen specfunc dht qrng rng randist fft poly fit multifit multifit_nlinear multilarge multilarge_nlinear rstat statistics siman sum integration interpolation histogram ode-initval ode-initval2 roots multiroots min multimin monte ntuple diff deriv cdf wavelet bspline spblas spmatrix splinalg doc -+ -+SUBLIBS = block/libgslblock.la blas/libgslblas.la bspline/libgslbspline.la complex/libgslcomplex.la cheb/libgslcheb.la dht/libgsldht.la diff/libgsldiff.la deriv/libgslderiv.la eigen/libgsleigen.la err/libgslerr.la fft/libgslfft.la fit/libgslfit.la histogram/libgslhistogram.la ieee-utils/libgslieeeutils.la integration/libgslintegration.la interpolation/libgslinterpolation.la linalg/libgsllinalg.la matrix/libgslmatrix.la min/libgslmin.la monte/libgslmonte.la multifit/libgslmultifit.la multifit_nlinear/libgslmultifit_nlinear.la multilarge/libgslmultilarge.la multilarge_nlinear/libgslmultilarge_nlinear.la multimin/libgslmultimin.la multiroots/libgslmultiroots.la ntuple/libgslntuple.la ode-initval/libgslodeiv.la ode-initval2/libgslodeiv2.la permutation/libgslpermutation.la combination/libgslcombination.la multiset/libgslmultiset.la poly/libgslpoly.la qrng/libgslqrng.la randist/libgslrandist.la rng/libgslrng.la roots/libgslroots.la siman/libgslsiman.la sort/libgslsort.la specfunc/libgsls pecfunc.la rstat/libgslrstat.la statistics/libgslstatistics.la sum/libgslsum.la sys/libgslsys.la test/libgsltest.la utils/libutils.la vector/libgslvector.la cdf/libgslcdf.la wavelet/libgslwavelet.la spmatrix/libgslspmatrix.la spblas/libgslspblas.la splinalg/libgslsplinalg.la -+ -+pkginclude_HEADERS = gsl_math.h gsl_pow_int.h gsl_nan.h gsl_machine.h gsl_mode.h gsl_precision.h gsl_types.h gsl_version.h gsl_minmax.h gsl_i
[gentoo-commits] proj/sci:master commit in: sci-libs/gsl/files/, sci-libs/gsl/
commit: 6e79edc188125e344b4edc354f1b9fc418561f71
Author: Justin Lecher gentoo org>
AuthorDate: Fri Feb 12 09:25:59 2016 +
Commit: Justin Lecher gentoo org>
CommitDate: Fri Feb 12 09:25:59 2016 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=6e79edc1
sci-libs/gsl: Version Bump
Package-Manager: portage-2.2.27
Signed-off-by: Justin Lecher gentoo.org>
sci-libs/gsl/files/gsl-2.1-cblas-external.patch | 326
sci-libs/gsl/gsl-2.1.ebuild | 79 ++
sci-libs/gsl/metadata.xml | 3 +
3 files changed, 408 insertions(+)
diff --git a/sci-libs/gsl/files/gsl-2.1-cblas-external.patch
b/sci-libs/gsl/files/gsl-2.1-cblas-external.patch
new file mode 100644
index 000..54cc880
--- /dev/null
+++ b/sci-libs/gsl/files/gsl-2.1-cblas-external.patch
@@ -0,0 +1,326 @@
+ Makefile.am | 8 +++---
+ ax_cblas.m4 | 69 +++
+ bspline/Makefile.am | 2 +-
+ configure.ac | 10 +++
+ eigen/Makefile.am | 2 +-
+ gsl-config.in | 4 +--
+ gsl.pc.in | 2 +-
+ interpolation/Makefile.am | 2 +-
+ linalg/Makefile.am| 2 +-
+ multifit/Makefile.am | 4 +--
+ multimin/Makefile.am | 4 +--
+ multiroots/Makefile.am| 2 +-
+ ode-initval/Makefile.am | 2 +-
+ poly/Makefile.am | 2 +-
+ specfunc/Makefile.am | 2 +-
+ wavelet/Makefile.am | 2 +-
+ 16 files changed, 100 insertions(+), 19 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 278dcd9..a75418c 100644
+--- a/Makefile.am
b/Makefile.am
+@@ -19,7 +19,7 @@ EXTRA_DIST = autogen.sh gsl-config.in gsl.pc.in configure.ac
THANKS BUGS gsl.spe
+
+ lib_LTLIBRARIES = libgsl.la
+ libgsl_la_SOURCES = version.c
+-libgsl_la_LIBADD = $(GSL_LIBADD) $(SUBLIBS)
++libgsl_la_LIBADD = $(GSL_LIBADD) $(SUBLIBS) @CBLAS_LINK_LIBS@
+ libgsl_la_LDFLAGS = $(GSL_LDFLAGS) -version-info $(GSL_LT_VERSION)
+ noinst_HEADERS = templates_on.h templates_off.h build.h
+
+@@ -29,10 +29,10 @@ m4data_DATA = gsl.m4
+ bin_PROGRAMS = gsl-randist gsl-histogram
+
+ gsl_randist_SOURCES = gsl-randist.c
+-gsl_randist_LDADD = libgsl.la cblas/libgslcblas.la
++gsl_randist_LDADD = libgsl.la
+
+ gsl_histogram_SOURCES = gsl-histogram.c
+-gsl_histogram_LDADD = libgsl.la cblas/libgslcblas.la
++gsl_histogram_LDADD = libgsl.la
+
+ check_SCRIPTS = test_gsl_histogram.sh pkgconfig.test
+ TESTS = test_gsl_histogram.sh pkgconfig.test
+@@ -51,6 +51,8 @@ edit = $(SED) \
+ -e 's|@GSL_CFLAGS[@]|$(GSL_CFLAGS)|g' \
+ -e 's|@GSL_LIBM[@]|$(GSL_LIBM)|g' \
+ -e 's|@GSL_LIBS[@]|$(GSL_LIBS)|g' \
++ -e 's|@CBLAS_CFLAGS[@]|$(CBLAS_CFLAGS)|g' \
++ -e 's|@CBLAS_LIBS[@]|$(CBLAS_LIBS)|g' \
+ -e 's|@LIBS[@]|$(LIBS)|g' \
+ -e 's|@VERSION[@]|$(VERSION)|g'
+
+diff --git a/ax_cblas.m4 b/ax_cblas.m4
+new file mode 100644
+index 000..6ef143a
+--- /dev/null
b/ax_cblas.m4
+@@ -0,0 +1,69 @@
++AC_DEFUN([AX_CBLAS],[
++
++ ext_cblas=no
++ ext_cblas_libs="-lcblas"
++ ext_cblas_cflags=""
++
++ AC_ARG_WITH(cblas-external,
++ [AS_HELP_STRING([--with-cblas-external],
++ [Use external CBLAS library (default is no)])],
++ [with_ext_cblas=$withval],
++ [with_ext_cblas=no])
++
++ case $with_ext_cblas in
++ no) ext_cblas=no ;;
++ yes) ext_cblas=yes ;;
++ -* | */* | *.a | *.so | *.so.* | *.o)
++ ext_cblas=yes
++ ext_cblas_libs="$with_cblas" ;;
++ *) ext_cblas=yes
++ ext_cblas_libs="-l$with_cblas" ;;
++ esac
++
++ AC_ARG_WITH(cblas-external-libs,
++ [AS_HELP_STRING([--with-cblas-external-libs=],
++ [External cblas libraries to link with (default is
"$ext_cblas_libs")])],
++ [ext_cblas_libs=$withval],
++ [])
++
++ AC_ARG_WITH(cblas-external-cflags,
++ [AS_HELP_STRING([--with-cblas-external-cflags=],
++ [Pre-processing flags to compile with external cblas
("-I")])],
++ [ext_cblas_cflags=$withval],
++ [])
++
++ if test x$ext_cblas != xno; then
++ if test "x$CBLAS_LIBS" = x; then
++ CBLAS_LIBS="$ext_cblas_libs"
++ fi
++ if test "x$CBLAS_CFLAGS" = x; then
++ CBLAS_CFLAGS="$ext_cblas_cflags"
++ fi
++
++ CFLAGS_sav="$CFLAGS"
++ CFLAGS="$CFLAGS $CBLAS_CFLAGS"
++ AC_CHECK_HEADER(cblas.h, ,
++ [AC_MSG_ERROR([
++ *** Header file cblas.h not found.
++ *** If you installed cblas header in a non standard place,
++ *** specify its install prefix using the following option
++ *** --with-cblas-external-cflags="-I"])
++ ])
++ CFLAGS="$CFLAGS_sav"
++
++ LIBS_sav="$LIBS"
++ LIBS="$LIBS $CBLAS_LIBS -lm"
++ AC_MSG_CHECKING([for cblas_sgemm in $CBLAS_LIBS])
++ AC_TRY_LINK_FUNC(cblas_sgemm, [ext_cblas=yes],
++ [AC_MSG_ERROR([
++
