Attachment 939977 Details for Bug 925571 – patch + spec changeset for -12

[patch] patch + spec changeset for -12

0001-handle-endianness-and-32-64-byte-size-using-libc-hea.patch (text/plain), 6.67 KB, created by Marcin Juszkiewicz on 2014-09-22 11:46:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcin Juszkiewicz

Created: 2014-09-22 11:46:58 UTC

Size: 6.67 KB

patch

obsolete

>From e8e9042827b8936204572e93981a22e4a35c8ab9 Mon Sep 17 00:00:00 2001
>From: Marcin Juszkiewicz <mjuszkiewicz@redhat.com>
>Date: Mon, 22 Sep 2014 13:44:48 +0200
>Subject: [PATCH] handle endianness and 32/64 byte size using libc headers
> (rhbz #925571)
>
>---
> ice-3.5.0-arm.patch   | 11 -----------
> ice-3.5.1-archs.patch | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++
> ice-3.5b-s390.patch   | 22 ---------------------
> ice.spec              | 15 +++++++-------
> 4 files changed, 63 insertions(+), 40 deletions(-)
> delete mode 100644 ice-3.5.0-arm.patch
> create mode 100644 ice-3.5.1-archs.patch
> delete mode 100644 ice-3.5b-s390.patch
>
>diff --git a/ice-3.5.0-arm.patch b/ice-3.5.0-arm.patch
>deleted file mode 100644
>index 59e7473..0000000
>--- a/ice-3.5.0-arm.patch
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- Ice-3.5.0/cpp/include/IceUtil/Config.h.orig	2013-04-01 11:20:37.000000000 +0100
>-+++ Ice-3.5.0/cpp/include/IceUtil/Config.h	2013-04-01 11:22:31.136976843 +0100
>-@@ -23,7 +23,7 @@
>- #if defined(__i386)     || defined(_M_IX86) || defined(__x86_64)  || \
>-     defined(_M_X64)     || defined(_M_IA64) || defined(__alpha__) || \
>-     defined(__ARMEL__) || defined(_M_ARM_FP) || \
>--    defined(__MIPSEL__) || (defined(__BYTE_ORDER) && (__BYTE_ORDER == __LITTLE_ENDIAN))
>-+    defined(__MIPSEL__) || defined(__arm__) || (defined(__BYTE_ORDER) && (__BYTE_ORDER == __LITTLE_ENDIAN))
>- #   define ICE_LITTLE_ENDIAN
>- #elif defined(__sparc) || defined(__sparc__) || defined(__hppa)      || \
>-       defined(__ppc__) || defined(__powerpc) || defined(_ARCH_COM) || \
>diff --git a/ice-3.5.1-archs.patch b/ice-3.5.1-archs.patch
>new file mode 100644
>index 0000000..9e51775
>--- /dev/null
>+++ b/ice-3.5.1-archs.patch
>@@ -0,0 +1,55 @@
>+Index: Ice-3.5.1/cpp/include/IceUtil/Config.h
>+===================================================================
>+--- Ice-3.5.1.orig/cpp/include/IceUtil/Config.h
>++++ Ice-3.5.1/cpp/include/IceUtil/Config.h
>+@@ -20,31 +20,28 @@
>+ # include <endian.h>
>+ #endif
>+ 
>+-#if defined(__i386)     || defined(_M_IX86) || defined(__x86_64)  || \
>+-    defined(_M_X64)     || defined(_M_IA64) || defined(__alpha__) || \
>+-    defined(__ARMEL__) || defined(_M_ARM_FP) || \
>+-    defined(__MIPSEL__) || (defined(__BYTE_ORDER) && (__BYTE_ORDER == __LITTLE_ENDIAN))
>+-#   define ICE_LITTLE_ENDIAN
>+-#elif defined(__sparc) || defined(__sparc__) || defined(__hppa)      || \
>+-      defined(__ppc__) || defined(__powerpc) || defined(_ARCH_COM) || \
>+-      defined(__MIPSEB__) || (defined(__BYTE_ORDER) && (__BYTE_ORDER == __BIG_ENDIAN))
>+-#   define ICE_BIG_ENDIAN
>+-#else
>+-#   error "Unknown architecture"
>++#if defined(HAVE_ENDIAN_H)
>++#  include <endian.h>
>++#  if __BYTE_ORDER==__LITTLE_ENDIAN
>++#    define ICE_LITTLE_ENDIAN
>++#  elif __BYTE_ORDER==__BIG_ENDIAN
>++#    define ICE_BIG_ENDIAN
>++#  else
>++#    error "Unknown endian type"
>++#  endif
>+ #endif
>+ 
>+ //
>+ // 32 or 64 bit mode?
>+ //
>+-#if defined(__sun) && (defined(__sparcv9) || defined(__x86_64))    || \
>+-      defined(__linux) && defined(__x86_64)                        || \
>+-      defined(__hppa) && defined(__LP64__)                         || \
>+-      defined(_ARCH_COM) && defined(__64BIT__)                     || \
>+-      defined(__alpha__)                                           || \
>+-      defined(_WIN64)
>+-#   define ICE_64
>+-#else
>+-#   define ICE_32
>++#if defined(HAVE_LIMITS_H)
>++#   include <stdint.h>
>++#   include <limits.h>
>++#   if __WORDSIZE == 64
>++#      define ICE_64
>++#   else
>++#      define ICE_32
>++#   endif
>+ #endif
>+ 
>+ //
>+Index: Ice-3.5.1/cpp/src/IceUtil/Makefile
>+===================================================================
>diff --git a/ice-3.5b-s390.patch b/ice-3.5b-s390.patch
>deleted file mode 100644
>index 383b7de..0000000
>--- a/ice-3.5b-s390.patch
>+++ /dev/null
>@@ -1,22 +0,0 @@
>-diff -ur Ice-3.5b.orig/cpp/include/IceUtil/Config.h Ice-3.5b/cpp/include/IceUtil/Config.h
>---- Ice-3.5b.orig/cpp/include/IceUtil/Config.h	2012-12-12 21:15:12.000000000 +0000
>-+++ Ice-3.5b/cpp/include/IceUtil/Config.h	2012-12-17 11:18:45.179923012 +0000
>-@@ -26,7 +26,7 @@
>- #   define ICE_LITTLE_ENDIAN
>- #elif defined(__sparc) || defined(__sparc__) || defined(__hppa)      || \
>-       defined(__ppc__) || defined(__powerpc) || defined(_ARCH_COM) || \
>--      defined(__MIPSEB__) || (defined(__BYTE_ORDER) && (__BYTE_ORDER == __BIG_ENDIAN))
>-+      defined(__MIPSEB__) || defined(__s390__) || (defined(__BYTE_ORDER) && (__BYTE_ORDER == __BIG_ENDIAN))
>- #   define ICE_BIG_ENDIAN
>- #else
>- #   error "Unknown architecture"
>-@@ -36,7 +36,7 @@
>- // 32 or 64 bit mode?
>- //
>- #if defined(__sun) && (defined(__sparcv9) || defined(__x86_64))    || \
>--      defined(__linux) && defined(__x86_64)                        || \
>-+      defined(__linux) && (defined(__x86_64) || defined(__s390x__)) || \
>-       defined(__hppa) && defined(__LP64__)                         || \
>-       defined(_ARCH_COM) && defined(__64BIT__)                     || \
>-       defined(__alpha__)                                           || \
>-Only in Ice-3.5b/cpp/include/IceUtil: .Config.h.swp
>diff --git a/ice.spec b/ice.spec
>index 66c8d3b..dc3c1c8 100644
>--- a/ice.spec
>+++ b/ice.spec
>@@ -10,7 +10,7 @@
> 
> Name:           ice
> Version:        3.5.1
>-Release:        11%{?dist}
>+Release:        12%{?dist}
> Summary:        ZeroC Object-Oriented middleware
> 
> Group:          System Environment/Libraries
>@@ -27,16 +27,14 @@ Source9:        icegridregistry.conf
> Source10:       icegridregistry.service
> Source11:       ice.ini
> Source12:       ice.pth
>-# Add support for the s390/s390x architecture
>-Patch0:         ice-3.5b-s390.patch
>+# handle endianness and 32/64 size
>+Patch0:         ice-3.5.1-archs.patch
> # don't build demo/test
> # TODO: should we keep it or not ?
> # significantly reduce compile time but shipping demos could be useful
> Patch1:         ice-3.5.1-dont-build-demo-test.patch
> # disable the CSharp interface
> Patch2:         ice-3.4.2-no-mono.patch
>-# ARM
>-Patch3:         ice-3.5.0-arm.patch
> # libdb4
> Patch4:         ice-3.5.0-libdb4.patch
> 
>@@ -208,12 +206,11 @@ Tools for developing Ice applications in PHP.
> 
> %prep
> %setup -q -n Ice-%{version}
>-%patch0 -p1 -b .s390
>+%patch0 -p1 -b .archs
> %patch1 -p1 -b .demo
> %if ! 0%{?with_mono}
> %patch2 -p1 -b .no-mono
> %endif
>-%patch3 -p1 -b .arm
> %patch4 -p1 -b .libdb4
> %patch5 -p1 -b .icegrid-registry
> %patch6 -p1 -b .marshalling-optionals
>@@ -546,6 +543,10 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} php -n -d extension_dir=%{buildroot}%{php
> 
> 
> %changelog
>+* Fri Sep 19 2014 Marcin Juszkiewicz <mjuszkiewicz@redhat.com> - 3.5.1-12
>+- revert -10 and -11 changes
>+- handle endianness and 32/64 byte size using libc headers (RHBZ #925571)
>+
> * Mon Sep 22 2014 HaÃ¯kel GuÃ©mar <hguemar@fedoraproject.org> - 3.5.1-11
> - Update aarch64 patch (RHBZ #925571)
> 
>-- 
>2.1.0
>

Actions: View | Diff

Attachments on bug 925571: 897934 | 939226 | 939977