pool/hdf5
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 200467 from devel:libraries:c_c++

Browse Source 
- hdf5-configure-long-double.patch: fix configure check for unsigned long
  long to long double conversion to not fail spuriously for 128bit long
  double
- Increase testsuite timeout for qemu user space build (forwarded request 200299 from Andreas_Schwab)

OBS-URL: https://build.opensuse.org/request/show/200467
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/hdf5?expand=0&rev=16
This commit is contained in:
Stephan Kulow 2013-09-25 15:14:33 +00:00 committed by Git OBS Bridge
parent 197b915f8c
commit 990b349eec
3 changed files with 80 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
hdf5-configure-long-double.patch Normal file
View File

@ -0,0 +1,66 @@
Index: hdf5-1.8.11/configure
===================================================================
--- hdf5-1.8.11.orig/configure
+++ hdf5-1.8.11/configure
@@ -30201,7 +30201,7 @@ else
/* Test if the last 2 bytes of mantissa are lost. Mainly for FreeBSD on Intel
* architecture(sleipnir) where it happens. */
/*if(endian==0 && c2[0]==0 && c2[1]==0)*/ /*little endian*/
- if(endian==0 && c2[0]==0) { /*little endian*/
+ if(endian==0 && size == 12 && c2[0]==0) { /*little endian*/
ret = 1;
goto done;
}
@@ -30220,16 +30220,16 @@ else
* instead of 0x0000403effffffffffffffff, 0x0000403efffffffffffffffe, ...,
* 0x0000403efffffffffffff000 ...
*/
- if(endian==0 && c2_cyg[0]==0 && c2_cyg[1]==0 && c2_cyg[2]==0 && c2_cyg[3]==0)
+ if(endian==0 && size == 12 && c2_cyg[0]==0 && c2_cyg[1]==0 && c2_cyg[2]==0 && c2_cyg[3]==0)
ret = 1;
+ if(c2_cyg)
+ free(c2_cyg);
done:
if(c1)
free(c1);
if(c2)
free(c2);
- if(c2_cyg)
- free(c2_cyg);
exit(ret);
}
Index: hdf5-1.8.11/configure.ac
===================================================================
--- hdf5-1.8.11.orig/configure.ac
+++ hdf5-1.8.11/configure.ac
@@ -3665,7 +3665,7 @@ else
/* Test if the last 2 bytes of mantissa are lost. Mainly for FreeBSD on Intel
* architecture(sleipnir) where it happens. */
/*if(endian==0 && c2[0]==0 && c2[1]==0)*/ /*little endian*/
- if(endian==0 && c2[0]==0) { /*little endian*/
+ if(endian==0 && size == 12 && c2[0]==0) { /*little endian*/
ret = 1;
goto done;
}
@@ -3684,16 +3684,16 @@ else
* instead of 0x0000403effffffffffffffff, 0x0000403efffffffffffffffe, ...,
* 0x0000403efffffffffffff000 ...
*/
- if(endian==0 && c2_cyg[0]==0 && c2_cyg[1]==0 && c2_cyg[2]==0 && c2_cyg[3]==0)
+ if(endian==0 && size == 12 && c2_cyg[0]==0 && c2_cyg[1]==0 && c2_cyg[2]==0 && c2_cyg[3]==0)
ret = 1;
+ if(c2_cyg)
+ free(c2_cyg);
done:
if(c1)
free(c1);
if(c2)
free(c2);
- if(c2_cyg)
- free(c2_cyg);
exit(ret);
}
], [hdf5_cv_ullong_to_ldouble_precision=yes], [hdf5_cv_ullong_to_ldouble_precision=no],)])

8
hdf5.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue Sep 24 07:04:42 UTC 2013 - schwab@suse.de
- hdf5-configure-long-double.patch: fix configure check for unsigned long
long to long double conversion to not fail spuriously for 128bit long
double
- Increase testsuite timeout for qemu user space build
-------------------------------------------------------------------
Fri Sep 13 12:18:27 UTC 2013 - pgajdos@suse.com

6
hdf5.spec
View File

@ -46,6 +46,7 @@ Patch2: hdf5-1.8.11-abort_unknown_host_config.patch
%ifarch %arm
Patch4: hdf5-1.8.10-tests-arm.patch
%endif
Patch5: hdf5-configure-long-double.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: gcc-c++
%if 0%{?suse_version} > 1140
@ -286,6 +287,7 @@ test "%{hdf5_libver}" = "${LT_VERS_INTERFACE}" || exit 1
%ifarch %arm
%patch4 -p0 -b .tests-arm
%endif
%patch5 -p1
echo "prepare parallel builds: %_mpi"
for build_dir in build %_mpi; do
@ -379,6 +381,10 @@ cat > %{buildroot}%{_sysconfdir}/rpm/macros.hdf5 <<EOF
EOF
%check
%if 0%{?qemu_user_space_build}
# default timeout is 1200 seconds
export HDF5_ALARM_SECONDS=3600
%endif
make -C build check
# ignore errors for parallel builds
export HDF5_Make_Ignore=yes