Adapated cblas patch to respect upstream policy about pkg-config, fixing tests (bug #370317)

(Portage version: 2.1.10.7/cvs/Linux x86_64)

2 files changed, 92 insertions, 91 deletions

diff --git a/sci-libs/gsl/ChangeLog b/sci-libs/gsl/ChangeLog
index 1238fd416976..d92ffad5acff 100644
--- a/sci-libs/gsl/ChangeLog
+++ b/sci-libs/gsl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/gsl
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/ChangeLog,v 1.81 2011/06/12 17:00:25 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/ChangeLog,v 1.82 2011/07/28 21:29:26 bicatali Exp $
+
+  28 Jul 2011; Sébastien Fabbro <bicatali@gentoo.org>
+  files/gsl-1.15-cblas.patch:
+  Adapated cblas patch to respect upstream policy about pkg-config, fixing
+  tests (bug #370317)
 
   12 Jun 2011; Tomáš Chvátal <scarabeus@gentoo.org> gsl-1.15.ebuild:
   Move to eapi4. Punt .la files. Run eselect only if really required for
diff --git a/sci-libs/gsl/files/gsl-1.15-cblas.patch b/sci-libs/gsl/files/gsl-1.15-cblas.patch
index fb67d159e247..dd402f392c17 100644
--- a/sci-libs/gsl/files/gsl-1.15-cblas.patch
+++ b/sci-libs/gsl/files/gsl-1.15-cblas.patch
@@ -1,46 +1,6 @@
-diff -Naur gsl-1.15.orig/Makefile.am gsl-1.15/Makefile.am
---- gsl-1.15.orig/Makefile.am	2011-05-21 11:49:07.000000000 +0200
-+++ gsl-1.15/Makefile.am	2011-05-21 11:49:28.000000000 +0200
-@@ -19,13 +19,12 @@
- 
- lib_LTLIBRARIES = libgsl.la
- libgsl_la_SOURCES = version.c
--libgsl_la_LIBADD = $(SUBLIBS)
-+libgsl_la_LIBADD = $(SUBLIBS) @CBLAS_LINK_LIBS@
- libgsl_la_LDFLAGS = -version-info $(GSL_LT_VERSION)
- noinst_HEADERS = templates_on.h templates_off.h build.h
- 
- MINGW32_HOST = @MINGW32_HOST@
- if MINGW32_HOST
--libgsl_la_LIBADD += cblas/libgslcblas.la
- libgsl_la_LDFLAGS += -no-undefined
- endif
- 
-@@ -35,10 +34,10 @@
- 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
-@@ -57,6 +56,8 @@
- 	-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 -Naur gsl-1.15.orig/acx_cblas.m4 gsl-1.15/acx_cblas.m4
+diff -Nur gsl-1.15.orig/acx_cblas.m4 gsl-1.15/acx_cblas.m4
 --- gsl-1.15.orig/acx_cblas.m4	1970-01-01 01:00:00.000000000 +0100
-+++ gsl-1.15/acx_cblas.m4	2011-05-21 11:49:28.000000000 +0200
++++ gsl-1.15/acx_cblas.m4	2011-07-28 22:16:03.000000000 +0100
 @@ -0,0 +1,60 @@
 +AC_DEFUN([ACX_CBLAS],[
 +  use_cblas=no
@@ -102,9 +62,9 @@ diff -Naur gsl-1.15.orig/acx_cblas.m4 gsl-1.15/acx_cblas.m4
 +	AC_SUBST(CBLAS_LIBS)
 + fi
 +])
-diff -Naur gsl-1.15.orig/bspline/Makefile.am gsl-1.15/bspline/Makefile.am
---- gsl-1.15.orig/bspline/Makefile.am	2011-05-21 11:49:07.000000000 +0200
-+++ gsl-1.15/bspline/Makefile.am	2011-05-21 11:49:28.000000000 +0200
+diff -Nur gsl-1.15.orig/bspline/Makefile.am gsl-1.15/bspline/Makefile.am
+--- gsl-1.15.orig/bspline/Makefile.am	2011-07-28 22:15:49.000000000 +0100
++++ gsl-1.15/bspline/Makefile.am	2011-07-28 22:16:03.000000000 +0100
 @@ -12,6 +12,6 @@
  
  TESTS = $(check_PROGRAMS)
@@ -113,9 +73,9 @@ diff -Naur gsl-1.15.orig/bspline/Makefile.am gsl-1.15/bspline/Makefile.am
 +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 = test.c
-diff -Naur gsl-1.15.orig/configure.ac gsl-1.15/configure.ac
---- gsl-1.15.orig/configure.ac	2011-05-21 11:49:07.000000000 +0200
-+++ gsl-1.15/configure.ac	2011-05-21 11:49:28.000000000 +0200
+diff -Nur gsl-1.15.orig/configure.ac gsl-1.15/configure.ac
+--- gsl-1.15.orig/configure.ac	2011-07-28 22:15:49.000000000 +0100
++++ gsl-1.15/configure.ac	2011-07-28 22:16:03.000000000 +0100
 @@ -190,6 +190,16 @@
    AC_CHECK_LIB(m, cos)
  fi
@@ -133,9 +93,9 @@ diff -Naur gsl-1.15.orig/configure.ac gsl-1.15/configure.ac
  dnl Remember to put a definition in acconfig.h for each of these
  AC_CHECK_DECLS(feenableexcept,,,[#define _GNU_SOURCE 1
  #include <fenv.h>]) 
-diff -Naur gsl-1.15.orig/eigen/Makefile.am gsl-1.15/eigen/Makefile.am
---- gsl-1.15.orig/eigen/Makefile.am	2011-05-21 11:49:07.000000000 +0200
-+++ gsl-1.15/eigen/Makefile.am	2011-05-21 11:49:28.000000000 +0200
+diff -Nur gsl-1.15.orig/eigen/Makefile.am gsl-1.15/eigen/Makefile.am
+--- gsl-1.15.orig/eigen/Makefile.am	2011-07-28 22:15:49.000000000 +0100
++++ gsl-1.15/eigen/Makefile.am	2011-07-28 22:16:03.000000000 +0100
 @@ -11,7 +11,7 @@
  
  TESTS = $(check_PROGRAMS)
@@ -145,9 +105,9 @@ diff -Naur gsl-1.15.orig/eigen/Makefile.am gsl-1.15/eigen/Makefile.am
  
  test_SOURCES = test.c
  
-diff -Naur gsl-1.15.orig/gsl-config.in gsl-1.15/gsl-config.in
---- gsl-1.15.orig/gsl-config.in	2011-05-21 11:49:07.000000000 +0200
-+++ gsl-1.15/gsl-config.in	2011-05-21 11:52:29.000000000 +0200
+diff -Nur gsl-1.15.orig/gsl-config.in gsl-1.15/gsl-config.in
+--- gsl-1.15.orig/gsl-config.in	2011-07-28 22:15:49.000000000 +0100
++++ gsl-1.15/gsl-config.in	2011-07-28 22:16:03.000000000 +0100
 @@ -58,11 +58,11 @@
  	;;
  
@@ -162,25 +122,21 @@ diff -Naur gsl-1.15.orig/gsl-config.in gsl-1.15/gsl-config.in
  	echo @GSL_LIBS@ $GSL_CBLAS_LIB @GSL_LIBM@
         	;;
  
-diff -Naur gsl-1.15.orig/gsl.pc.in gsl-1.15/gsl.pc.in
---- gsl-1.15.orig/gsl.pc.in	2011-05-21 11:49:07.000000000 +0200
-+++ gsl-1.15/gsl.pc.in	2011-05-21 11:53:47.000000000 +0200
-@@ -2,10 +2,9 @@
+diff -Nur gsl-1.15.orig/gsl.pc.in gsl-1.15/gsl.pc.in
+--- gsl-1.15.orig/gsl.pc.in	2011-07-28 22:15:49.000000000 +0100
++++ gsl-1.15/gsl.pc.in	2011-07-28 22:20:14.000000000 +0100
+@@ -2,7 +2,7 @@
  exec_prefix=@exec_prefix@
  libdir=@libdir@
  includedir=@includedir@
 -GSL_CBLAS_LIB=-lgslcblas
++GSL_CBLAS_LIB=@CBLAS_LIBS@
  
  Name: GSL
  Description: GNU Scientific Library
- Version: @VERSION@
--Libs: @GSL_LIBS@ ${GSL_CBLAS_LIB} @GSL_LIBM@ @LIBS@
--Cflags: @GSL_CFLAGS@
-+Libs: @GSL_LIBS@ @CBLAS_LIBS@ @GSL_LIBM@ @LIBS@
-+Cflags: @GSL_CFLAGS@ @CBLAS_CFLAGS@
-diff -Naur gsl-1.15.orig/interpolation/Makefile.am gsl-1.15/interpolation/Makefile.am
---- gsl-1.15.orig/interpolation/Makefile.am	2011-05-21 11:49:07.000000000 +0200
-+++ gsl-1.15/interpolation/Makefile.am	2011-05-21 11:49:28.000000000 +0200
+diff -Nur gsl-1.15.orig/interpolation/Makefile.am gsl-1.15/interpolation/Makefile.am
+--- gsl-1.15.orig/interpolation/Makefile.am	2011-07-28 22:15:49.000000000 +0100
++++ gsl-1.15/interpolation/Makefile.am	2011-07-28 22:16:03.000000000 +0100
 @@ -10,7 +10,7 @@
  
  TESTS = $(check_PROGRAMS)
@@ -190,9 +146,9 @@ diff -Naur gsl-1.15.orig/interpolation/Makefile.am gsl-1.15/interpolation/Makefi
  
  test_SOURCES = test.c
  
-diff -Naur gsl-1.15.orig/linalg/Makefile.am gsl-1.15/linalg/Makefile.am
---- gsl-1.15.orig/linalg/Makefile.am	2011-05-21 11:49:07.000000000 +0200
-+++ gsl-1.15/linalg/Makefile.am	2011-05-21 11:49:28.000000000 +0200
+diff -Nur gsl-1.15.orig/linalg/Makefile.am gsl-1.15/linalg/Makefile.am
+--- gsl-1.15.orig/linalg/Makefile.am	2011-07-28 22:15:49.000000000 +0100
++++ gsl-1.15/linalg/Makefile.am	2011-07-28 22:16:03.000000000 +0100
 @@ -12,7 +12,7 @@
  
  check_PROGRAMS = test
@@ -202,9 +158,49 @@ diff -Naur gsl-1.15.orig/linalg/Makefile.am gsl-1.15/linalg/Makefile.am
  
  test_SOURCES = test.c
  
-diff -Naur gsl-1.15.orig/multifit/Makefile.am gsl-1.15/multifit/Makefile.am
---- gsl-1.15.orig/multifit/Makefile.am	2011-05-21 11:49:07.000000000 +0200
-+++ gsl-1.15/multifit/Makefile.am	2011-05-21 11:49:28.000000000 +0200
+diff -Nur gsl-1.15.orig/Makefile.am gsl-1.15/Makefile.am
+--- gsl-1.15.orig/Makefile.am	2011-07-28 22:15:49.000000000 +0100
++++ gsl-1.15/Makefile.am	2011-07-28 22:16:03.000000000 +0100
+@@ -19,13 +19,12 @@
+ 
+ lib_LTLIBRARIES = libgsl.la
+ libgsl_la_SOURCES = version.c
+-libgsl_la_LIBADD = $(SUBLIBS)
++libgsl_la_LIBADD = $(SUBLIBS) @CBLAS_LINK_LIBS@
+ libgsl_la_LDFLAGS = -version-info $(GSL_LT_VERSION)
+ noinst_HEADERS = templates_on.h templates_off.h build.h
+ 
+ MINGW32_HOST = @MINGW32_HOST@
+ if MINGW32_HOST
+-libgsl_la_LIBADD += cblas/libgslcblas.la
+ libgsl_la_LDFLAGS += -no-undefined
+ endif
+ 
+@@ -35,10 +34,10 @@
+ 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
+@@ -57,6 +56,8 @@
+ 	-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 -Nur gsl-1.15.orig/multifit/Makefile.am gsl-1.15/multifit/Makefile.am
+--- gsl-1.15.orig/multifit/Makefile.am	2011-07-28 22:15:49.000000000 +0100
++++ gsl-1.15/multifit/Makefile.am	2011-07-28 22:16:03.000000000 +0100
 @@ -13,8 +13,8 @@
  TESTS = $(check_PROGRAMS)
  
@@ -216,9 +212,9 @@ diff -Naur gsl-1.15.orig/multifit/Makefile.am gsl-1.15/multifit/Makefile.am
 -#demo_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../randist/libgslrandist.la ../rng/libgslrng.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la
 +#demo_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../randist/libgslrandist.la ../rng/libgslrng.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la
  
-diff -Naur gsl-1.15.orig/multimin/Makefile.am gsl-1.15/multimin/Makefile.am
---- gsl-1.15.orig/multimin/Makefile.am	2011-05-21 11:49:07.000000000 +0200
-+++ gsl-1.15/multimin/Makefile.am	2011-05-21 11:49:28.000000000 +0200
+diff -Nur gsl-1.15.orig/multimin/Makefile.am gsl-1.15/multimin/Makefile.am
+--- gsl-1.15.orig/multimin/Makefile.am	2011-07-28 22:15:49.000000000 +0100
++++ gsl-1.15/multimin/Makefile.am	2011-07-28 22:16:03.000000000 +0100
 @@ -13,8 +13,8 @@
  TESTS = $(check_PROGRAMS) 
  
@@ -230,9 +226,9 @@ diff -Naur gsl-1.15.orig/multimin/Makefile.am gsl-1.15/multimin/Makefile.am
 -#demo_LDADD = libgslmultimin.la ../min/libgslmin.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../linalg/libgsllinalg.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
 +#demo_LDADD = libgslmultimin.la ../min/libgslmin.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../linalg/libgsllinalg.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
  
-diff -Naur gsl-1.15.orig/multiroots/Makefile.am gsl-1.15/multiroots/Makefile.am
---- gsl-1.15.orig/multiroots/Makefile.am	2011-05-21 11:49:07.000000000 +0200
-+++ gsl-1.15/multiroots/Makefile.am	2011-05-21 11:49:28.000000000 +0200
+diff -Nur gsl-1.15.orig/multiroots/Makefile.am gsl-1.15/multiroots/Makefile.am
+--- gsl-1.15.orig/multiroots/Makefile.am	2011-07-28 22:15:49.000000000 +0100
++++ gsl-1.15/multiroots/Makefile.am	2011-07-28 22:16:03.000000000 +0100
 @@ -15,5 +15,5 @@
  TESTS = $(check_PROGRAMS)
  
@@ -240,9 +236,9 @@ diff -Naur gsl-1.15.orig/multiroots/Makefile.am gsl-1.15/multiroots/Makefile.am
 -test_LDADD = libgslmultiroots.la ../linalg/libgsllinalg.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
 +test_LDADD = libgslmultiroots.la ../linalg/libgsllinalg.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
  
-diff -Naur gsl-1.15.orig/ode-initval/Makefile.am gsl-1.15/ode-initval/Makefile.am
---- gsl-1.15.orig/ode-initval/Makefile.am	2011-05-21 11:49:07.000000000 +0200
-+++ gsl-1.15/ode-initval/Makefile.am	2011-05-21 11:49:28.000000000 +0200
+diff -Nur gsl-1.15.orig/ode-initval/Makefile.am gsl-1.15/ode-initval/Makefile.am
+--- gsl-1.15.orig/ode-initval/Makefile.am	2011-07-28 22:15:49.000000000 +0100
++++ gsl-1.15/ode-initval/Makefile.am	2011-07-28 22:16:03.000000000 +0100
 @@ -12,7 +12,7 @@
  
  TESTS = $(check_PROGRAMS)
@@ -252,9 +248,9 @@ diff -Naur gsl-1.15.orig/ode-initval/Makefile.am gsl-1.15/ode-initval/Makefile.a
  
  test_SOURCES = test.c
  
-diff -Naur gsl-1.15.orig/poly/Makefile.am gsl-1.15/poly/Makefile.am
---- gsl-1.15.orig/poly/Makefile.am	2011-05-21 11:49:07.000000000 +0200
-+++ gsl-1.15/poly/Makefile.am	2011-05-21 11:49:28.000000000 +0200
+diff -Nur gsl-1.15.orig/poly/Makefile.am gsl-1.15/poly/Makefile.am
+--- gsl-1.15.orig/poly/Makefile.am	2011-07-28 22:15:49.000000000 +0100
++++ gsl-1.15/poly/Makefile.am	2011-07-28 22:16:03.000000000 +0100
 @@ -10,7 +10,7 @@
  
  TESTS = $(check_PROGRAMS)
@@ -264,9 +260,9 @@ diff -Naur gsl-1.15.orig/poly/Makefile.am gsl-1.15/poly/Makefile.am
  
  test_SOURCES = test.c
  test_LDADD = libgslpoly.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-diff -Naur gsl-1.15.orig/specfunc/Makefile.am gsl-1.15/specfunc/Makefile.am
---- gsl-1.15.orig/specfunc/Makefile.am	2011-05-21 11:49:07.000000000 +0200
-+++ gsl-1.15/specfunc/Makefile.am	2011-05-21 11:49:28.000000000 +0200
+diff -Nur gsl-1.15.orig/specfunc/Makefile.am gsl-1.15/specfunc/Makefile.am
+--- gsl-1.15.orig/specfunc/Makefile.am	2011-07-28 22:15:49.000000000 +0100
++++ gsl-1.15/specfunc/Makefile.am	2011-07-28 22:16:03.000000000 +0100
 @@ -12,7 +12,7 @@
  
  check_PROGRAMS = test
@@ -276,9 +272,9 @@ diff -Naur gsl-1.15.orig/specfunc/Makefile.am gsl-1.15/specfunc/Makefile.am
  
  test_SOURCES = test_sf.c test_sf.h test_airy.c test_bessel.c test_coulomb.c test_dilog.c test_gamma.c test_hyperg.c test_legendre.c test_mathieu.c
    
-diff -Naur gsl-1.15.orig/wavelet/Makefile.am gsl-1.15/wavelet/Makefile.am
---- gsl-1.15.orig/wavelet/Makefile.am	2011-05-21 11:49:07.000000000 +0200
-+++ gsl-1.15/wavelet/Makefile.am	2011-05-21 11:49:28.000000000 +0200
+diff -Nur gsl-1.15.orig/wavelet/Makefile.am gsl-1.15/wavelet/Makefile.am
+--- gsl-1.15.orig/wavelet/Makefile.am	2011-07-28 22:15:49.000000000 +0100
++++ gsl-1.15/wavelet/Makefile.am	2011-07-28 22:16:03.000000000 +0100
 @@ -10,7 +10,7 @@
  
  TESTS = $(check_PROGRAMS)