From f0445deda0b59dfe81764ad2e1ca30c3e9b22a42 Mon Sep 17 00:00:00 2001 From: Ivana Hutarova Varekova Date: Mon, 9 May 2011 15:25:34 +0200 Subject: [PATCH] - resolves: #695148 link gsl against atlas package for blas operations --- gsl-1.15-atlas.patch | 16 ++++++++++++++++ gsl.spec | 10 +++++++++- 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 gsl-1.15-atlas.patch diff --git a/gsl-1.15-atlas.patch b/gsl-1.15-atlas.patch new file mode 100644 index 0000000..9a1de2a --- /dev/null +++ b/gsl-1.15-atlas.patch @@ -0,0 +1,16 @@ +diff -up gsl-1.15/Makefile.in.pom gsl-1.15/Makefile.in +--- gsl-1.15/Makefile.in.pom 2011-05-09 12:37:30.000000000 +0200 ++++ gsl-1.15/Makefile.in 2011-05-09 12:48:31.000000000 +0200 +@@ -89,9 +89,9 @@ LTLIBRARIES = $(lib_LTLIBRARIES) + libgsl_la_DEPENDENCIES = $(SUBLIBS) $(am__append_1) + am_libgsl_la_OBJECTS = version.lo + libgsl_la_OBJECTS = $(am_libgsl_la_OBJECTS) +-libgsl_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ +- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(libgsl_la_LDFLAGS) $(LDFLAGS) -o $@ ++libgsl_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libgsl_la_LDFLAGS) $(LDFLAGS) -L/usr/lib/atlas/ -lcblas -latlas -o $@ + PROGRAMS = $(bin_PROGRAMS) + am_gsl_histogram_OBJECTS = gsl-histogram.$(OBJEXT) + gsl_histogram_OBJECTS = $(am_gsl_histogram_OBJECTS) diff --git a/gsl.spec b/gsl.spec index cc386bc..ce2eb3d 100644 --- a/gsl.spec +++ b/gsl.spec @@ -1,11 +1,12 @@ Summary: The GNU Scientific Library for numerical analysis Name: gsl Version: 1.15 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.gnu.org/software/gsl/ Source: ftp://ftp.gnu.org/gnu/gsl/%{name}-%{version}.tar.gz Patch0: gsl-1.10-lib64.patch Patch1: gsl-1.14-link.patch +Patch2: gsl-1.15-atlas.patch # info part of this package is under GFDL license # eigen/nonsymmv.c and eigen/schur.c # contains rutiens which are part of LAPACK - under BSD style license @@ -13,6 +14,8 @@ License: GPLv3 and GFDL and BSD Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pkgconfig +BuildRequires: atlas-devel +Requires: atlas %description The GNU Scientific Library (GSL) is a collection of routines for @@ -34,6 +37,7 @@ developing programs using the GSL (GNU Scientific Library). %setup -q %patch0 -p1 -b .lib64 %patch1 -p1 -b .libs +%patch2 -p1 -b .atlas iconv -f windows-1252 -t utf-8 THANKS > THANKS.aux touch -r THANKS THANKS.aux mv THANKS.aux THANKS @@ -95,6 +99,10 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Mon May 9 2011 Ivana Hutarova Varekova - 1.15-2 +- resolves: #695148 + link gsl against atlas package for blas operations + * Mon May 9 2011 Ivana Hutarova Varekova - 1.15-1 - update to 1.15