[libpqxx/f15] gcc46 fix (noticed on arm)
Rex Dieter
rdieter at fedoraproject.org
Wed Jan 18 15:47:07 UTC 2012
commit abde0020d63a331850c228999bfbd0b1f9cd5d94
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Wed Jan 18 09:47:02 2012 -0600
gcc46 fix (noticed on arm)
libpqxx-3.0.2-gcc46.patch | 11 +++++++++++
libpqxx.spec | 9 ++++++++-
2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/libpqxx-3.0.2-gcc46.patch b/libpqxx-3.0.2-gcc46.patch
new file mode 100644
index 0000000..346f6dc
--- /dev/null
+++ b/libpqxx-3.0.2-gcc46.patch
@@ -0,0 +1,11 @@
+diff -up libpqxx-3.0.2/include/pqxx/compiler-internal.hxx.gcc46 libpqxx-3.0.2/include/pqxx/compiler-internal.hxx
+--- libpqxx-3.0.2/include/pqxx/compiler-internal.hxx.gcc46 2009-07-04 00:38:35.000000000 -0500
++++ libpqxx-3.0.2/include/pqxx/compiler-internal.hxx 2012-01-18 09:46:12.374025738 -0600
+@@ -53,6 +53,7 @@
+
+ #include "pqxx/compiler-public.hxx"
+
++#include <cstddef>
+ #ifdef PQXX_HAVE_LIMITS
+ #include <limits>
+ #else // PQXX_HAVE_LIMITS
diff --git a/libpqxx.spec b/libpqxx.spec
index 48ca167..019b8f6 100644
--- a/libpqxx.spec
+++ b/libpqxx.spec
@@ -2,7 +2,7 @@
Name: libpqxx
Epoch: 1
Version: 3.0.2
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: C++ client API for PostgreSQL
Group: System Environment/Libraries
@@ -14,6 +14,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch3: libpqxx-2.6.8-multilib.patch
+## upstreamable patches
+Patch50: libpqxx-3.0.2-gcc46.patch
+
BuildRequires: postgresql-devel
BuildRequires: pkgconfig
@@ -39,6 +42,7 @@ Requires: postgresql-devel
chmod -x COPYING
%patch3 -p1 -b .multilib
+%patch50 -p1 -b .gcc46
%build
@@ -83,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Jan 18 2012 Rex Dieter <rdieter at fedoraproject.org> 1:3.0.2-6
+- gcc46 fix (noticed on arm)
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:3.0.2-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
More information about the scm-commits
mailing list