Login
[x]
Log in using an account from:
Fedora Account System
Red Hat Associate
Red Hat Customer
Or login using a Red Hat Bugzilla account
Forgot Password
Login:
Hide Forgot
Create an Account
Red Hat Bugzilla – Attachment 897934 Details for
Bug 925571
ice: Does not support aarch64 in rawhide
[?]
New
Simple Search
Advanced Search
My Links
Browse
Requests
Reports
Current State
Search
Tabular reports
Graphical reports
Duplicates
Other Reports
User Changes
Plotly Reports
Bug Status
Bug Severity
Non-Defaults
|
Product Dashboard
Help
Page Help!
Bug Writing Guidelines
What's new
Browser Support Policy
5.0.4.rh83 Release notes
FAQ
Guides index
User guide
Web Services
Contact
Legal
This site requires JavaScript to be enabled to function correctly, please enable it.
[patch]
Handle AArch64
ice-aarch64.patch (text/plain), 5.89 KB, created by
Marcin Juszkiewicz
on 2014-05-21 11:45:05 UTC
(
hide
)
Description:
Handle AArch64
Filename:
MIME Type:
Creator:
Marcin Juszkiewicz
Created:
2014-05-21 11:45:05 UTC
Size:
5.89 KB
patch
obsolete
>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..04ed02a >--- /dev/null >+++ b/ice-3.5.1-archs.patch >@@ -0,0 +1,66 @@ >+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 >+=================================================================== >+--- Ice-3.5.1.orig/cpp/src/IceUtil/Makefile >++++ Ice-3.5.1/cpp/src/IceUtil/Makefile >+@@ -41,7 +41,7 @@ SRCS = $(OBJS:.o=.cpp) >+ include $(top_srcdir)/config/Make.rules >+ >+ CPPFLAGS := $(CPPFLAGS) $(ICEUTIL_FLAGS) -DICE_UTIL_API_EXPORTS -I.. >+-LINKWITH := $(ICEUTIL_OS_LIBS) >++LINKWITH := $(ICEUTIL_OS_LIBS) # -lrt >+ >+ ifeq ($(STATICLIBS),yes) >+ $(libdir)/$(LIBNAME): $(OBJS) >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 b1367f6..20f172f 100644 >--- a/ice.spec >+++ b/ice.spec >@@ -24,18 +24,15 @@ 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 >+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 >+Patch3: ice-3.5.0-libdb4.patch > > # Ice doesn't officially support ppc64 at all > ExcludeArch: ppc64 >@@ -196,13 +193,12 @@ 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 >+%patch3 -p1 -b .libdb4 > > %build > # Set the CLASSPATH correctly for the Java compile
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 925571
:
897934
|
939226
|
939977