From 18459c8167c4d855ea954747e90fb2204660a3ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20=C4=8Cajka?= Date: Thu, 22 May 2014 11:09:48 +0200 Subject: [PATCH] Fixed s390x build, enabled test on ppc --- hdf-s390.patch | 12 ++++++++++++ hdf.spec | 9 +++++---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/hdf-s390.patch b/hdf-s390.patch index b2b9510..7593dd7 100644 --- a/hdf-s390.patch +++ b/hdf-s390.patch @@ -334,3 +334,15 @@ diff -up hdf-4.2.10/mfhdf/ncgen/ncgen.l.s390 hdf-4.2.10/mfhdf/ncgen/ncgen.l if (dd < INT_MIN || dd > INT_MAX) #else if (dd < LONG_MIN || dd > LONG_MAX) +diff -up hdf-4.2.10/mfhdf/ncgen/ncgenyy.c.s390 hdf-4.2.10/mfhdf/ncgen/ncgenyy.c +--- hdf-4.2.10/mfhdf/ncgen/ncgenyy.c.s390 2014-05-22 08:33:21.700132543 -0400 ++++ hdf-4.2.10/mfhdf/ncgen/ncgenyy.c 2014-05-22 08:33:50.990132543 -0400 +@@ -989,7 +989,7 @@ YY_RULE_SETUP + yyerror(errstr); + } + +-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || __powerpc64__ ++#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || __powerpc64__ || __s390x__ + if (dd < INT_MIN || dd > INT_MAX) + #else + if (dd < LONG_MIN || dd > LONG_MAX) diff --git a/hdf.spec b/hdf.spec index fe3fb9f..eedf1f9 100644 --- a/hdf.spec +++ b/hdf.spec @@ -1,6 +1,6 @@ Name: hdf Version: 4.2.10 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A general purpose library and file format for storing scientific data License: BSD Group: System Environment/Libraries @@ -108,10 +108,7 @@ popd %check -# bugzilla #961007 -%ifnarch ppc %{power64} make check -%endif %clean @@ -133,6 +130,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu May 22 2014 Jakub Čajka 4.2.10-2 +- Fixed build/tests on s390x +- Tests enabled on ppc + * Fri Feb 14 2014 Orion Poplawski 4.2.10-1 - Update to 4.2.10 - Rebase arm, ppc, and s390 patches