libtpms-0.5.1-14 with gcc-4.7 compilation fixes

This commit is contained in:
Stefan Berger 2012-01-27 13:21:25 -05:00
parent 559cb9ad9f
commit a80cc7e528
3 changed files with 5 additions and 50 deletions

View File

@ -1,46 +0,0 @@
diff -up libtpms-0.5.1/src/tpm_crypto_freebl.c.secondary libtpms-0.5.1/src/tpm_crypto_freebl.c
--- libtpms-0.5.1/src/tpm_crypto_freebl.c.secondary 2011-12-20 17:28:41.000000000 +0100
+++ libtpms-0.5.1/src/tpm_crypto_freebl.c 2011-12-20 17:43:53.000000000 +0100
@@ -1841,12 +1841,17 @@ void TPM_SHA1Delete(void **context)
#if defined (__x86_64__) || \
defined(__amd64__) || \
defined(__ia64__) || \
- defined(__powerpc64__)
+ defined(__powerpc64__) || \
+ defined(__s390x__) || \
+ defined(__sparc__) && defined(__arch64__)
#define IS_64
typedef PRUint64 SHA_HW_t;
#elif defined (__i386__) || \
- defined (__powerpc__)
+ defined (__powerpc__) || \
+ defined (__s390__) || \
+ defined (__sparc__) || \
+ defined (__arm__)
typedef PRUint32 SHA_HW_t;
#undef IS_64
diff -up libtpms-0.5.1/tests/freebl_sha1flattensize.c.secondary libtpms-0.5.1/tests/freebl_sha1flattensize.c
--- libtpms-0.5.1/tests/freebl_sha1flattensize.c.secondary 2011-12-20 18:17:02.000000000 +0100
+++ libtpms-0.5.1/tests/freebl_sha1flattensize.c 2011-12-20 18:17:32.000000000 +0100
@@ -8,12 +8,17 @@
#if defined (__x86_64__) || \
defined (__amd64__) || \
defined (__ia64__) || \
- defined (__powerpc64__)
+ defined (__powerpc64__) || \
+ defined(__s390x__) || \
+ defined(__sparc__) && defined(__arch64__)
#define EXPECTED_LIB_FLATTENSIZE 248
#elif defined (__i386__) || \
- defined (__powerpc__)
+ defined (__powerpc__) || \
+ defined (__s390__) || \
+ defined (__sparc__) || \
+ defined (__arm__)
#define EXPECTED_LIB_FLATTENSIZE 160

View File

@ -2,7 +2,7 @@
%define name libtpms %define name libtpms
%define version 0.5.1 %define version 0.5.1
%define release 13 %define release 14
# Valid crypto subsystems are 'freebl' and 'openssl' # Valid crypto subsystems are 'freebl' and 'openssl'
%define crypto_subsystem freebl %define crypto_subsystem freebl
@ -18,7 +18,6 @@ License: BSD
Group: Development/Libraries Group: Development/Libraries
Url: http://sourceforge.net/projects/ibmswtpm Url: http://sourceforge.net/projects/ibmswtpm
Source: http://bergerstefan.users.sourceforge.net/libtpms/%{name}-%{version}.tar.gz Source: http://bergerstefan.users.sourceforge.net/libtpms/%{name}-%{version}.tar.gz
Patch0: %{name}-0.5.1-secondary.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
%if %{crypto_subsystem} == openssl %if %{crypto_subsystem} == openssl
BuildRequires: openssl-devel BuildRequires: openssl-devel
@ -61,7 +60,6 @@ Libtpms header files and documentation.
%prep %prep
%setup -q %setup -q
%patch0 -p1
%build %build
@ -95,6 +93,9 @@ make %{?_smp_mflags} install DESTDIR=${RPM_BUILD_ROOT}
%postun -p /sbin/ldconfig %postun -p /sbin/ldconfig
%changelog %changelog
* Fri Jan 27 2012 Stefan Berger - 0.5.1-14
- fix gcc-4.7 compilation problem
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.5.1-13 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.5.1-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild

View File

@ -1 +1 @@
988a67fc1da12e2c1a63eb0dfcac8f58 libtpms-0.5.1.tar.gz a24e78d4fe1084c2d1283d25d6bac8f6 libtpms-0.5.1.tar.gz