rpms/wl-kmod/devel wl-kmod-006_gcc_4.9.patch, NONE, 1.1 wl-kmod.spec, 1.82, 1.83
Author: nvieville
Update of /cvs/nonfree/rpms/wl-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv20750
Modified Files:
wl-kmod.spec
Added Files:
wl-kmod-006_gcc_4.9.patch
Log Message:
* Thu May 08 2014 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> -
6.30.223.141-7
- Added patch to build with gcc >= 4.9 - fix error __TIME__ and __DATE__ macros
wl-kmod-006_gcc_4.9.patch:
wl_linux.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE wl-kmod-006_gcc_4.9.patch ---
diff -Naur hybrid-v35_64-nodebug-pcoem-6_30_223_141.orig/src/wl/sys/wl_linux.c
hybrid-v35_64-nodebug-pcoem-6_30_223_141/src/wl/sys/wl_linux.c
--- hybrid-v35_64-nodebug-pcoem-6_30_223_141.orig/src/wl/sys/wl_linux.c 2013-09-14
19:48:07.624004000 +0200
+++ hybrid-v35_64-nodebug-pcoem-6_30_223_141/src/wl/sys/wl_linux.c 2014-05-08
11:59:36.808178703 +0200
@@ -2043,8 +2043,8 @@
void
wl_dump_ver(wl_info_t *wl, struct bcmstrbuf *b)
{
- bcm_bprintf(b, "wl%d: %s %s version %s\n", wl->pub->unit,
- __DATE__, __TIME__, EPI_VERSION_STR);
+ bcm_bprintf(b, "wl%d: version %s\n", wl->pub->unit,
+ EPI_VERSION_STR);
}
#if defined(BCMDBG)
Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/devel/wl-kmod.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- wl-kmod.spec 22 Apr 2014 18:23:47 -0000 1.82
+++ wl-kmod.spec 8 May 2014 10:36:22 -0000 1.83
@@ -7,7 +7,7 @@
Name: wl-kmod
Version: 6.30.223.141
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Kernel module for Broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -20,6 +20,7 @@
Patch2: wl-kmod-003_kernel_3.8.patch
Patch3: wl-kmod-004_kernel_3.10.patch
Patch4: wl-kmod-005_kernel_3.15.patch
+Patch5: wl-kmod-006_gcc_4.9.patch
BuildRequires: %{_bindir}/kmodtool
@@ -63,6 +64,7 @@
%patch2 -p1 -b .kernel-3.8
%patch3 -p1 -b .kernel-3.10
%patch4 -p1 -b .kernel-3.15
+%patch5 -p1 -b .gcc-4.9
popd
for kernel_version in %{?kernel_versions} ; do
@@ -92,6 +94,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Thu May 08 2014 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> -
6.30.223.141-7
+- Added patch to build with gcc >= 4.9 - fix error __TIME__ and __DATE__ macros
+
* Tue Apr 22 2014 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> -
6.30.223.141-6
- Added patch to build for kernel >= 3.15