Accepting request 701517 from home:Andreas_Schwab:Factory

- lp64.patch: Support all LP64 architectures

OBS-URL: https://build.opensuse.org/request/show/701517
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/rttr?expand=0&rev=6
This commit is contained in:
Adam Majer 2019-05-09 13:48:28 +00:00 committed by Git OBS Bridge
parent 5ba605cffb
commit 01ebd0ff1c
3 changed files with 21 additions and 0 deletions

13
lp64.patch Normal file
View File

@ -0,0 +1,13 @@
Index: rttr-0.9.6/src/rttr/detail/base/core_prerequisites.h
===================================================================
--- rttr-0.9.6.orig/src/rttr/detail/base/core_prerequisites.h
+++ rttr-0.9.6/src/rttr/detail/base/core_prerequisites.h
@@ -89,7 +89,7 @@ namespace rttr
// Architecture
/////////////////////////////////////////////////////////////////////////////////////////
#if defined(__x86_64__) || defined(_M_X64) || defined(__powerpc64__) || defined(__alpha__) ||\
- defined(__ia64__) || defined(__s390__) || defined(__s390x__)
+ defined(__ia64__) || defined(__s390__) || defined(__s390x__) || defined(_LP64) || defined(__LP64__)
# define RTTR_ARCH_TYPE RTTR_ARCH_64
#else
# define RTTR_ARCH_TYPE RTTR_ARCH_32

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed May 8 07:42:41 UTC 2019 - Andreas Schwab <schwab@suse.de>
- lp64.patch: Support all LP64 architectures
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Mar 29 11:27:35 UTC 2019 - Luca Beltrame <lbeltrame@kde.org> Fri Mar 29 11:27:35 UTC 2019 - Luca Beltrame <lbeltrame@kde.org>

View File

@ -34,6 +34,8 @@ Patch2: doxygen_remove_date_time.patch
Patch3: skip_json_example.patch Patch3: skip_json_example.patch
# PATCH-FIX-OPENSUSE fix-include-permissions.patch fix wrong permissions of headers (https://github.com/rttrorg/rttr/issues/147) # PATCH-FIX-OPENSUSE fix-include-permissions.patch fix wrong permissions of headers (https://github.com/rttrorg/rttr/issues/147)
Patch4: fix-include-permissions.patch Patch4: fix-include-permissions.patch
# PATCH-FIX-UPSTREAM lp64.patch Support all LP64 architectures (https://github.com/rttrorg/rttr/pull/231)
Patch5: lp64.patch
BuildRequires: cmake BuildRequires: cmake
BuildRequires: dos2unix BuildRequires: dos2unix
BuildRequires: doxygen BuildRequires: doxygen
@ -53,6 +55,7 @@ library itself, which is written in C++.
%patch2 -p1 %patch2 -p1
%patch3 -p1 %patch3 -p1
%patch4 -p1 %patch4 -p1
%patch5 -p1
%build %build
find . -type f -exec chmod a-x "{}" + find . -type f -exec chmod a-x "{}" +