From c40372ec1fe95957cd68a51c9e1ff430a5f55b6afc9732fda8d04a3f7395ad9f Mon Sep 17 00:00:00 2001 From: Lars Vogdt Date: Sun, 2 Oct 2011 08:10:39 +0000 Subject: [PATCH] Accepting request 85846 from devel:libraries:c_c++ - Workaround qemu-arm bugs. (forwarded request 85844 from elvigia) OBS-URL: https://build.opensuse.org/request/show/85846 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gsl?expand=0&rev=19 --- gsl.changes | 10 ++++++++ gsl.spec | 47 ++++++++++++++++++------------------ qawc-test-x86-precision.diff | 20 ++++++++++++--- 3 files changed, 49 insertions(+), 28 deletions(-) diff --git a/gsl.changes b/gsl.changes index 8ec55b5..69e381b 100644 --- a/gsl.changes +++ b/gsl.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Sat Oct 1 01:08:56 UTC 2011 - crrodriguez@opensuse.org + +- Workaround qemu-arm bugs. + +------------------------------------------------------------------- +Thu Sep 29 08:01:43 UTC 2011 - andrea.turrini@gmail.com + +- Made descriptions in gls.spec more readable + ------------------------------------------------------------------- Sun Jul 17 10:18:18 UTC 2011 - badshah400@gmail.com diff --git a/gsl.spec b/gsl.spec index 2a926a6..e93293c 100644 --- a/gsl.spec +++ b/gsl.spec @@ -43,7 +43,6 @@ Patch: gsl-1.6-initvars.diff Patch5: gsl-wrap.diff Patch6: qawc-test-x86-precision.diff Url: http://www.gnu.org/software/gsl/ -Prefix: /usr BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -55,16 +54,15 @@ high level languages. The library covers the following areas: -Complex Numbers Roots of Polynomials Special Functions -Vectors and Matrices Permutations Sorting BLAS Support - Linear Algebra Eigensystems Fast Fourier Transforms - Quadrature Random Numbers Quasi-Random Sequences Random -Distributions Statistics Histograms N-Tuples - Monte Carlo Integration Simulated Annealing Differential -Equations Interpolation Numerical Differentiation Chebyshev - Series Acceleration Approximation Discrete Hankel -Root-Finding Minimization Transforms Least-Squares Fitting - Physical Constants IEEE Floating-Point +Complex Numbers - Roots of Polynomials - Special Functions - +Vectors and Matrices - Permutations - Sorting - BLAS Support - +Linear Algebra - Eigensystems - Fast Fourier Transforms - Quadrature - +Random Numbers - Quasi-Random Sequences - Random Distributions - +Statistics - Histograms - N-Tuples - Monte Carlo Integration - +Simulated Annealing - Differential Equations - Interpolation - +Numerical Differentiation - Chebyshev Approximation - Series Acceleration - +Discrete Hankel Transforms - Root-Finding - Minimization - +Least-Squares Fitting - Physical Constants - IEEE Floating-Point @@ -100,16 +98,15 @@ high level languages. The library covers the following areas, -Complex Numbers Roots of Polynomials Special Functions -Vectors and Matrices Permutations Sorting BLAS Support - Linear Algebra Eigensystems Fast Fourier Transforms - Quadrature Random Numbers Quasi-Random Sequences Random -Distributions Statistics Histograms N-Tuples - Monte Carlo Integration Simulated Annealing Differential -Equations Interpolation Numerical Differentiation Chebyshev - Series Acceleration Approximation Discrete Hankel -Root-Finding Minimization Transforms Least-Squares Fitting - Physical Constants IEEE Floating-Point +Complex Numbers - Roots of Polynomials - Special Functions - +Vectors and Matrices - Permutations - Sorting - BLAS Support - +Linear Algebra - Eigensystems - Fast Fourier Transforms - Quadrature - +Random Numbers - Quasi-Random Sequences - Random Distributions - +Statistics - Histograms - N-Tuples - Monte Carlo Integration - +Simulated Annealing - Differential Equations - Interpolation - +Numerical Differentiation - Chebyshev Approximation - Series Acceleration - +Discrete Hankel Transforms - Root-Finding - Minimization - +Least-Squares Fitting - Physical Constants - IEEE Floating-Point @@ -128,12 +125,12 @@ Authors: %setup -q %patch -p1 %patch5 -p1 -%patch6 -p1 -autoreconf -fi +%patch6 %build +autoreconf -fi RPM_OPT_FLAGS=`echo "$RPM_OPT_FLAGS" | sed 's/-fstack-protector//'` -CFLAGS="$RPM_OPT_FLAGS -O2 -fno-strict-aliasing" \ +CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \ %configure --disable-static --with-pic --enable-shared --with-gnu-ld --infodir=%{_infodir} make %{?jobs:-j%jobs} # latex2html (dvips) is braindead in its rejection of '.' in a dir name @@ -146,7 +143,9 @@ make %{?jobs:-j%jobs} #mv %{name} %{name}-%{version} %check +%if ! 0%{?qemu_user_space_build} make check +%endif %install make install DESTDIR=$RPM_BUILD_ROOT diff --git a/qawc-test-x86-precision.diff b/qawc-test-x86-precision.diff index 4a303c2..847e7d4 100644 --- a/qawc-test-x86-precision.diff +++ b/qawc-test-x86-precision.diff @@ -1,7 +1,6 @@ -diff -wruN -x '*~' ../orig-gsl-1.14/integration/test.c ./integration/test.c ---- ../orig-gsl-1.14/integration/test.c 2010-03-10 12:32:48.000000000 +0100 -+++ ./integration/test.c 2010-12-08 09:48:11.000000000 +0100 -@@ -1754,7 +1754,11 @@ +--- integration/test.c.orig ++++ integration/test.c +@@ -1754,7 +1754,11 @@ int main (void) gsl_test_rel(w->rlist[i],r[i],1e-14,"qawc(f459) rlist") ; for (i = 0; i < 6 ; i++) @@ -13,3 +12,16 @@ diff -wruN -x '*~' ../orig-gsl-1.14/integration/test.c ./integration/test.c for (i = 0; i < 6 ; i++) gsl_test_int((int)w->order[i],order[i]-1,"qawc(f459) order"); +--- configure.ac.orig ++++ configure.ac +@@ -87,7 +87,9 @@ AC_CANONICAL_HOST + + dnl Checks for programs. + AC_LANG(C) +-AC_PROG_CC ++AC_PROG_CC_STDC ++AC_USE_SYSTEM_EXTENSIONS ++AC_SYS_LARGEFILE + AC_PROG_CPP + AC_PROG_INSTALL + AC_PROG_LN_S