diff options
| author | Remi Collet <fedora@famillecollet.com> | 2017-03-13 17:57:37 +0100 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2017-03-13 17:57:37 +0100 |
| commit | dfe08b8c15d2a8887e97718492512d7dec65d7fc (patch) | |
| tree | 9d742ded4873c3ccdf46d96666364b133e5c4c9a | |
| parent | 170d8261e97fcf7c6e1ae82cd872ba71468d5a68 (diff) | |
cassandra-cpp-driver: EL-6 patch
| -rw-r--r-- | 4d4453b555ec50701d9f50e8d97e5ef9720a4bfe.patch | 27 | ||||
| -rw-r--r-- | cassandra-cpp-driver.spec | 8 |
2 files changed, 34 insertions, 1 deletions
diff --git a/4d4453b555ec50701d9f50e8d97e5ef9720a4bfe.patch b/4d4453b555ec50701d9f50e8d97e5ef9720a4bfe.patch new file mode 100644 index 0000000..2285803 --- /dev/null +++ b/4d4453b555ec50701d9f50e8d97e5ef9720a4bfe.patch @@ -0,0 +1,27 @@ +From 4d4453b555ec50701d9f50e8d97e5ef9720a4bfe Mon Sep 17 00:00:00 2001 +From: mpenick <michael.penick@datastax.com> +Date: Fri, 10 Mar 2017 11:50:09 -0700 +Subject: [PATCH] Fixed cass_int64_t <--> int64_t compatability on GCC + +--- + include/cassandra.h | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/include/cassandra.h b/include/cassandra.h +index d77cb47..02d4ed1 100644 +--- a/include/cassandra.h ++++ b/include/cassandra.h +@@ -104,8 +104,13 @@ typedef __UINT64_TYPE__ cass_uint64_t; + typedef __INT64_TYPE__ cass_int64_t; + typedef unsigned __INT64_TYPE__ cass_uint64_t; + #elif defined(__GNUC__) ++# if defined(__x86_64__) ++typedef long int cass_int64_t; ++typedef unsigned long int cass_uint64_t; ++# else + typedef long long int cass_int64_t; + typedef unsigned long long int cass_uint64_t; ++# endif + #else + typedef long long cass_int64_t; + typedef unsigned long long cass_uint64_t; diff --git a/cassandra-cpp-driver.spec b/cassandra-cpp-driver.spec index 68b6487..f4f5c6e 100644 --- a/cassandra-cpp-driver.spec +++ b/cassandra-cpp-driver.spec @@ -17,13 +17,15 @@ Name: cassandra-cpp-driver Summary: DataStax C/C++ Driver for Apache Cassandra Version: 2.6.0 -Release: 1%{?dist} +Release: 2%{?dist} License: ASL 2.0 Group: System Environment/Libraries URL: http://datastax.github.io/cpp-driver/ Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}-%{gh_short}.tar.gz +Patch0: 4d4453b555ec50701d9f50e8d97e5ef9720a4bfe.patch + BuildRequires: cmake >= 2.6.4 BuildRequires: libuv-devel BuildRequires: openssl-devel @@ -49,6 +51,7 @@ for %{name}. %prep %setup -q -n %{gh_project}-%{gh_commit} +%patch0 -p1 -b .upstream find examples -name .gitignore -exec rm {} \; -print @@ -89,6 +92,9 @@ rm %{buildroot}%{_libdir}//pkgconfig/cassandra_static.pc %changelog +* Mon Mar 13 2017 Remi Collet <remi@fedoraproject.org> - 2.6.0-2 +- add upstream patch for EL-6 + * Fri Mar 10 2017 Remi Collet <remi@fedoraproject.org> - 2.6.0-1 - update to 2.6.0 - open https://datastax-oss.atlassian.net/browse/CPP-442 |