[libkni3] fix build with gcc 4.7

Tom Callaway spot at fedoraproject.org
Thu Mar 8 16:30:05 UTC 2012


commit f05751f7a72e758c2e645315881ebe2e489abed6
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Thu Mar 8 11:30:02 2012 -0500

    fix build with gcc 4.7

 kni-3.9.2-gcc47.patch |   11 +++++++++++
 libkni3.spec          |    7 ++++++-
 2 files changed, 17 insertions(+), 1 deletions(-)
---
diff --git a/kni-3.9.2-gcc47.patch b/kni-3.9.2-gcc47.patch
new file mode 100644
index 0000000..76d1622
--- /dev/null
+++ b/kni-3.9.2-gcc47.patch
@@ -0,0 +1,11 @@
+diff -up KNI_3.9.2/src/Base/cdlCOM.cpp.gcc47 KNI_3.9.2/src/Base/cdlCOM.cpp
+--- KNI_3.9.2/src/Base/cdlCOM.cpp.gcc47	2012-03-08 11:25:45.466392402 -0500
++++ KNI_3.9.2/src/Base/cdlCOM.cpp	2012-03-08 11:25:54.399317676 -0500
+@@ -26,6 +26,7 @@
+ #include <cstdio>
+ 
+ #include <cstdlib>
++#include <unistd.h>
+ #ifdef WIN32
+ 
+ CCdlCOM::CCdlCOM(TCdlCOMDesc ccd) : _deviceName(""), _ccd(), _prtHdl(INVALID_HANDLE_VALUE), _oto() {
diff --git a/libkni3.spec b/libkni3.spec
index fd11d18..efc51d5 100644
--- a/libkni3.spec
+++ b/libkni3.spec
@@ -1,6 +1,6 @@
 Name:           libkni3
 Version:        3.9.2
-Release:        15%{?dist}
+Release:        16%{?dist}
 Summary:        C++ KNI library v3 for the Katana 300 robot arm
 
 Group:          System Environment/Libraries
@@ -11,6 +11,7 @@ Patch0:         kni-3.9.2-gcc43.patch
 Patch1:         kni-3.9.2-sofixes.patch
 Patch2:         kni-3.9.2-ctor.patch
 Patch3:         kni-3.9.2-noexit.patch
+Patch4:         kni-3.9.2-gcc47.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  doxygen, graphviz
@@ -73,6 +74,7 @@ This package contains demo applications for %{name}.
 %patch1 -p1 -b .sofixes
 %patch2 -p1 -b .ctor
 %patch3 -p1 -b .noexit
+%patch4 -p1 -b .gcc47
 
 
 %build
@@ -157,6 +159,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Mar  8 2012 Tom Callaway <spot at fedoraproject.org> - 3.9.2-16
+- fix build with gcc 4.7
+
 * Tue Feb 28 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.9.2-15
 - Rebuilt for c++ ABI breakage
 


More information about the scm-commits mailing list