From 96ba8ab04b4551a6975a143ee9cabc300a5b5d91 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Thu, 11 Dec 2014 21:45:38 +0100 Subject: [PATCH] - 3.14 already uses gcc 4.9 features - rel 3 --- gcc-4.9.patch | 8 ++++---- wl.spec | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gcc-4.9.patch b/gcc-4.9.patch index d505355..d085f86 100644 --- a/gcc-4.9.patch +++ b/gcc-4.9.patch @@ -4,12 +4,12 @@ WL_ALL_PASSIVE_ENAB(wl) ? ", Passive Mode" : "", EPI_VERSION_STR); #ifdef BCMDBG -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 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) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) +#pragma GCC diagnostic pop +#endif #endif @@ -19,13 +19,13 @@ void wl_dump_ver(wl_info_t *wl, struct bcmstrbuf *b) { -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 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) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) +#pragma GCC diagnostic pop +#endif } diff --git a/wl.spec b/wl.spec index c2bff4d..5d57ac6 100644 --- 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 2 +%define rel 3 %define pname wl %define file_ver %(echo %{version} | tr . _) Summary: Broadcom 802.11 a/b/g/n hybrid Linux networking device driver -- 2.44.0