From 52cf8848f448bac826bce778e50503e231428ab3 Mon Sep 17 00:00:00 2001 From: Dan HorĂ¡k Date: Jun 09 2009 06:14:00 +0000 Subject: - add support for s390/s390x --- diff --git a/cryptopp-5.6.0-s390.patch b/cryptopp-5.6.0-s390.patch new file mode 100644 index 0000000..8791262 --- /dev/null +++ b/cryptopp-5.6.0-s390.patch @@ -0,0 +1,20 @@ +--- cryptopp-5.6.0/config.h.orig 2009-06-09 07:53:08.000000000 +0200 ++++ cryptopp-5.6.0/config.h 2009-06-09 07:54:24.000000000 +0200 +@@ -4,7 +4,7 @@ + // ***************** Important Settings ******************** + + // define this if running on a big-endian CPU +-#if !defined(IS_LITTLE_ENDIAN) && (defined(__BIG_ENDIAN__) || defined(__sparc) || defined(__sparc__) || defined(__hppa__) || defined(__mips__) || (defined(__MWERKS__) && !defined(__INTEL__))) ++#if !defined(IS_LITTLE_ENDIAN) && (defined(__BIG_ENDIAN__) || defined(__sparc) || defined(__sparc__) || defined(__hppa__) || defined(__mips__) || defined(__s390__) || (defined(__MWERKS__) && !defined(__INTEL__))) + # define IS_BIG_ENDIAN + #endif + +@@ -127,7 +127,7 @@ const lword LWORD_MAX = W64LIT(0xfffffff + typedef word64 word; + #else + #define CRYPTOPP_NATIVE_DWORD_AVAILABLE +- #if defined(__alpha__) || defined(__ia64__) || defined(_ARCH_PPC64) || defined(__x86_64__) || defined(__mips64) || defined(__sparc64__) ++ #if defined(__alpha__) || defined(__ia64__) || defined(_ARCH_PPC64) || defined(__x86_64__) || defined(__mips64) || defined(__sparc64__) || defined(__s390x__) + #if defined(__GNUC__) && !defined(__INTEL_COMPILER) && !(CRYPTOPP_GCC_VERSION == 40001 && defined(__APPLE__)) && CRYPTOPP_GCC_VERSION >= 30400 + // GCC 4.0.1 on MacOS X is missing __umodti3 and __udivti3 + // mode(TI) division broken on amd64 with GCC earlier than GCC 3.4 diff --git a/cryptopp.spec b/cryptopp.spec index dd446bf..6192498 100644 --- a/cryptopp.spec +++ b/cryptopp.spec @@ -1,6 +1,6 @@ Name: cryptopp Version: 5.6.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Public domain C++ class library of cryptographic schemes License: Public Domain Group: System Environment/Libraries @@ -12,6 +12,8 @@ Patch0: cryptopp-5.6.0-autotools.patch Patch1: cryptopp-5.6.0-gcc4.3.patch # Don't try to build the patented code Patch2: cryptopp-5.6.0-nomars.patch +# Add support for s390/s390x +Patch3: cryptopp-5.6.0-s390.patch BuildRequires: doxygen, autoconf, libtool BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -63,6 +65,7 @@ This package contains programs for manipulating %{name} routines. rm -f GNUmakefile %patch0 -p1 %patch1 -p1 -b .gcc4.3 +%patch3 -p1 -b .s390 autoreconf --verbose --force --install perl -pi -e 's/\r$//g' License.txt Readme.txt @@ -115,6 +118,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Jun 9 2009 Dan Horak 5.6.0-2 +- add support for s390/s390x + * Sun Mar 15 2009 Aurelien Bompard 5.6.0-1 - version 5.6.0 - rediff patches