fix build with gcc 4.7
This commit is contained in:
parent
22b21d132b
commit
f05751f7a7
11
kni-3.9.2-gcc47.patch
Normal file
11
kni-3.9.2-gcc47.patch
Normal file
@ -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() {
|
@ -1,6 +1,6 @@
|
|||||||
Name: libkni3
|
Name: libkni3
|
||||||
Version: 3.9.2
|
Version: 3.9.2
|
||||||
Release: 15%{?dist}
|
Release: 16%{?dist}
|
||||||
Summary: C++ KNI library v3 for the Katana 300 robot arm
|
Summary: C++ KNI library v3 for the Katana 300 robot arm
|
||||||
|
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
@ -11,6 +11,7 @@ Patch0: kni-3.9.2-gcc43.patch
|
|||||||
Patch1: kni-3.9.2-sofixes.patch
|
Patch1: kni-3.9.2-sofixes.patch
|
||||||
Patch2: kni-3.9.2-ctor.patch
|
Patch2: kni-3.9.2-ctor.patch
|
||||||
Patch3: kni-3.9.2-noexit.patch
|
Patch3: kni-3.9.2-noexit.patch
|
||||||
|
Patch4: kni-3.9.2-gcc47.patch
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
|
|
||||||
BuildRequires: doxygen, graphviz
|
BuildRequires: doxygen, graphviz
|
||||||
@ -73,6 +74,7 @@ This package contains demo applications for %{name}.
|
|||||||
%patch1 -p1 -b .sofixes
|
%patch1 -p1 -b .sofixes
|
||||||
%patch2 -p1 -b .ctor
|
%patch2 -p1 -b .ctor
|
||||||
%patch3 -p1 -b .noexit
|
%patch3 -p1 -b .noexit
|
||||||
|
%patch4 -p1 -b .gcc47
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
@ -157,6 +159,9 @@ rm -rf %{buildroot}
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Mar 8 2012 Tom Callaway <spot@fedoraproject.org> - 3.9.2-16
|
||||||
|
- fix build with gcc 4.7
|
||||||
|
|
||||||
* Tue Feb 28 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.9.2-15
|
* Tue Feb 28 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.9.2-15
|
||||||
- Rebuilt for c++ ABI breakage
|
- Rebuilt for c++ ABI breakage
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user