[gearbox] gcc 4.8 build error fixes
rmattes
rmattes at fedoraproject.org
Wed Jan 11 00:44:35 UTC 2012
commit 011120e80d6110e8a68167e80dfd31086859c2c9
Author: Rich Mattes <richmattes at gmail.com>
Date: Tue Jan 10 19:44:16 2012 -0500
gcc 4.8 build error fixes
gearbox-9.11.gcc48.patch | 41 +++++++++++++++++++++++++++++++++++++++++
gearbox.spec | 7 ++++++-
2 files changed, 47 insertions(+), 1 deletions(-)
---
diff --git a/gearbox-9.11.gcc48.patch b/gearbox-9.11.gcc48.patch
new file mode 100644
index 0000000..1cbda75
--- /dev/null
+++ b/gearbox-9.11.gcc48.patch
@@ -0,0 +1,41 @@
+diff -up ./src/flexiport/logfile.h.gcc48 ./src/flexiport/logfile.h
+--- ./src/flexiport/logfile.h.gcc48 2012-01-10 19:23:17.151842096 -0500
++++ ./src/flexiport/logfile.h 2012-01-10 19:23:56.009270119 -0500
+@@ -31,6 +31,7 @@
+ #if defined (WIN32)
+ #include <winsock2.h> // For timeval
+ #else
++ #include <unistd.h>
+ #include <sys/time.h>
+ #endif
+ #include <string>
+diff -up ./src/flexiport/port.h.gcc48 ./src/flexiport/port.h
+--- ./src/flexiport/port.h.gcc48 2012-01-10 19:14:50.716226011 -0500
++++ ./src/flexiport/port.h 2012-01-10 19:16:38.142174812 -0500
+@@ -28,6 +28,7 @@
+ #ifndef __PORT_H
+ #define __PORT_H
+
++#include "unistd.h"
+ #include <string>
+ #include <map>
+
+diff -up ./src/gbxserialacfr/lockfile/lockfile.h.gcc48 ./src/gbxserialacfr/lockfile/lockfile.h
+--- ./src/gbxserialacfr/lockfile/lockfile.h.gcc48 2012-01-10 19:27:32.502995588 -0500
++++ ./src/gbxserialacfr/lockfile/lockfile.h 2012-01-10 19:33:54.887037220 -0500
+@@ -10,6 +10,7 @@
+ #ifndef GBXSERIALACFR_LOCKFILE_H
+ #define GBXSERIALACFR_LOCKFILE_H
+
++#include <unistd.h>
+ #include <exception>
+ #include <string>
+
+diff -up ./src/gbxsmartbatteryacfr/test/darttest/checksumtest.cpp.gcc48 ./src/gbxsmartbatteryacfr/test/darttest/checksumtest.cpp
+--- ./src/gbxsmartbatteryacfr/test/darttest/checksumtest.cpp.gcc48 2012-01-10 19:37:34.197090763 -0500
++++ ./src/gbxsmartbatteryacfr/test/darttest/checksumtest.cpp 2012-01-10 19:37:46.490542527 -0500
+@@ -1,3 +1,4 @@
++#include <unistd.h>
+ #include <iostream>
+ #include <sstream>
+
diff --git a/gearbox.spec b/gearbox.spec
index 1669128..99a6a2b 100644
--- a/gearbox.spec
+++ b/gearbox.spec
@@ -1,6 +1,6 @@
Name: gearbox
Version: 9.11
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: A collection of usable peer-reviewed robotics-related libraries
Group: Development/Libraries
@@ -15,6 +15,7 @@ Patch1: gearbox-9.11.fixpkgconfig.patch
Patch2: gearbox-9.11.fixdso.patch
# Add detection of s390x architecture
Patch3: gearbox-9.11.s390.patch
+Patch4: gearbox-9.11.gcc48.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -60,6 +61,7 @@ you will need to install %{name}-devel.
%patch1 -p1 -b .fixpkgconfig
%patch2 -p1 -b .fixdso
%patch3 -p1 -b .s390
+%patch4 -p0 -b .gcc48
%build
%cmake -DENABLE_LIB_BASICEXAMPLE=OFF -DENABLE_LIB_GBXUTILACFR=ON -DENABLE_LIB_GBXGARMINACFR=ON -DENABLE_LIB_GBXSERIALACFR=ON -DHOKUYO_AIST_BUILD_BINDINGS=OFF -DGBX_BUILD_TESTS=ON -DCMAKE_SKIP_RPATH:BOOL=ON\
@@ -109,6 +111,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Jan 11 2012 Rich Mattes <richmattes at gmail.com> - 9.11-9
+- gcc 4.8 build error fixes
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 9.11-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
More information about the scm-commits
mailing list