- fix build with kernels using gcc 4.9 features

- rel 2

diff --git a/gcc-4.9.patch b/gcc-4.9.patch
new file mode 100644 (file)
index 0000000..d505355
--- /dev/null
+++ b/gcc-4.9.patch
@@ -0,0 +1,33 @@
+--- wl-6.30.223.248/src/wl/sys/wl_linux.c~     2014-12-11 21:16:46.000000000 +0100
++++ wl-6.30.223.248/src/wl/sys/wl_linux.c      2014-12-11 21:31:47.006131594 +0100
+@@ -722,7 +722,14 @@
+               WL_ALL_PASSIVE_ENAB(wl) ?  ", Passive Mode" : "", EPI_VERSION_STR);
+ 
+ #ifdef BCMDBG
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0)
++#pragma GCC diagnostic push
++#pragma GCC diagnostic ignored "-Wdate-time"
++#endif
+       printf(" (Compiled in " SRCBASE " at " __TIME__ " on " __DATE__ ")");
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0)
++#pragma GCC diagnostic pop
++#endif
+ #endif 
+       printf("\n");
+ 
+@@ -2049,8 +2056,15 @@
+ void
+ wl_dump_ver(wl_info_t *wl, struct bcmstrbuf *b)
+ {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0)
++#pragma GCC diagnostic push
++#pragma GCC diagnostic ignored "-Wdate-time"
++#endif
+       bcm_bprintf(b, "wl%d: %s %s version %s\n", wl->pub->unit,
+               __DATE__, __TIME__, EPI_VERSION_STR);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0)
++#pragma GCC diagnostic pop
++#endif
+ }
+ 
+ #if defined(BCMDBG)

diff --git a/wl.spec b/wl.spec
index 24ba90437c9d7d84d53d1f7bc7dbeab3589c5337..c2bff4d9b74ef028f1fb725c0e7d83c9fd19e320 100644 (file)
--- a/wl.spec
+++ b/wl.spec
@@ -25,7 +25,7 @@ exit 1
 %define                kpkg    %(echo %{_build_kernels} | tr , '\\n' | while read n ; do echo %%undefine alt_kernel ; [ -z "$n" ] || echo %%define alt_kernel $n ; echo %%kernel_pkg ; done)
 %define                bkpkg   %(echo %{_build_kernels} | tr , '\\n' | while read n ; do echo %%undefine alt_kernel ; [ -z "$n" ] || echo %%define alt_kernel $n ; echo %%build_kernel_pkg ; done)
 
-%define                rel     1
+%define                rel     2
 %define                pname   wl
 %define                file_ver        %(echo %{version} | tr . _)
 Summary:       Broadcom 802.11 a/b/g/n hybrid Linux networking device driver
@@ -42,6 +42,7 @@ Source2:      http://www.broadcom.com/docs/linux_sta/README.txt
 # Source2-md5: 8a6e8708a5e00ab6d841cde51d70eb1b
 Source3:       dkms.conf
 Patch0:                linux-3.17.patch
+Patch1:                gcc-4.9.patch
 URL:           http://www.broadcom.com/support/802.11/linux_sta.php
 BuildRequires: rpmbuild(macros) >= 1.678
 %{?with_dist_kernel:%{expand:%kbrs}}
@@ -123,6 +124,7 @@ EOF\
 %endif
 %setup -c -T -q -n %{pname}-%{version} -b%{src}
 %patch0 -p1
+%patch1 -p1
 
 # cleanup backups after patching
 find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f