From 01ebd0ff1c97f375cb208864fea30826c0c2c499b9dd06900c36a69d3af761d8 Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Thu, 9 May 2019 13:48:28 +0000 Subject: [PATCH] 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 --- lp64.patch | 13 +++++++++++++ rttr.changes | 5 +++++ rttr.spec | 3 +++ 3 files changed, 21 insertions(+) create mode 100644 lp64.patch diff --git a/lp64.patch b/lp64.patch new file mode 100644 index 0000000..43e1fd8 --- /dev/null +++ b/lp64.patch @@ -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 diff --git a/rttr.changes b/rttr.changes index 0cb2e51..14a8561 100644 --- a/rttr.changes +++ b/rttr.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed May 8 07:42:41 UTC 2019 - Andreas Schwab + +- lp64.patch: Support all LP64 architectures + ------------------------------------------------------------------- Fri Mar 29 11:27:35 UTC 2019 - Luca Beltrame diff --git a/rttr.spec b/rttr.spec index 0c67fa6..f5f31cd 100644 --- a/rttr.spec +++ b/rttr.spec @@ -34,6 +34,8 @@ Patch2: doxygen_remove_date_time.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) 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: dos2unix BuildRequires: doxygen @@ -53,6 +55,7 @@ library itself, which is written in C++. %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %build find . -type f -exec chmod a-x "{}" +