[xsupplicant] fix build for gcc 4.7

Tom Callaway spot at fedoraproject.org
Thu Jan 5 20:49:42 UTC 2012


commit 218409a63c271f2b222bce247446ffa95bb7fcea
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Thu Jan 5 15:49:39 2012 -0500

    fix build for gcc 4.7

 xsupplicant-2.2.0-gcc47.patch |   12 ++++++++++++
 xsupplicant.spec              |    9 ++++++++-
 2 files changed, 20 insertions(+), 1 deletions(-)
---
diff --git a/xsupplicant-2.2.0-gcc47.patch b/xsupplicant-2.2.0-gcc47.patch
new file mode 100644
index 0000000..5749d2e
--- /dev/null
+++ b/xsupplicant-2.2.0-gcc47.patch
@@ -0,0 +1,12 @@
+diff -up XSupplicant-2.2.0-src/xsupplicant-ui/xsupptray/main.cpp.gcc47 XSupplicant-2.2.0-src/xsupplicant-ui/xsupptray/main.cpp
+--- XSupplicant-2.2.0-src/xsupplicant-ui/xsupptray/main.cpp.gcc47	2012-01-05 15:45:39.227669265 -0500
++++ XSupplicant-2.2.0-src/xsupplicant-ui/xsupptray/main.cpp	2012-01-05 15:45:47.510593833 -0500
+@@ -30,6 +30,8 @@
+  *   Nortel Networks for an OEM Commercial License.
+  **/
+ 
++#include <unistd.h>
++
+ #include "stdafx.h"
+ 
+ extern "C" {
diff --git a/xsupplicant.spec b/xsupplicant.spec
index 7c8e54f..625c54a 100644
--- a/xsupplicant.spec
+++ b/xsupplicant.spec
@@ -1,7 +1,7 @@
 Name:		xsupplicant
 Summary:	Open Source Implementation of IEEE 802.1x
 Version:	2.2.0
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	GPLv2+ or BSD with advertising
 Group:		System Environment/Base
 URL:		http://www.open1x.org/
@@ -11,6 +11,7 @@ Patch2:		xsupplicant-2.1.8-ui-Fedora.patch
 Patch3:		XSupplicant-2.1.8-ppc-fix.patch
 Patch4:		xsupplicant-2.1.9-force-release.patch
 Patch5:		xsupplicant-2.2.0-implicit-DSO.patch
+Patch6:		xsupplicant-2.2.0-gcc47.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libtool, dos2unix, libxml2-devel, pcsc-lite-devel, libtnc-devel
 BuildRequires:	openssl-devel, wireless-tools-devel
@@ -50,6 +51,9 @@ QT User Interface for XSupplicant.
 %patch4 -p1 -b .release
 # Fix implicit linking issues
 %patch5 -p1 -b .DSO
+# Fix gcc 4.7 issues
+%patch6 -p1 -b .gcc47
+
 cd xsupplicant
 autoreconf -vfis
 
@@ -131,6 +135,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/
 
 %changelog
+* Thu Jan  5 2012 Tom Callaway <spot at fedoraproject.org> - 2.2.0-4
+- fix compile with gcc 4.7
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 


More information about the scm-commits mailing list