rpms/wl-kmod/devel wl-kmod-003_gcc_4.9_remove_TIME_DATE_macros.patch, NONE, 1.1 wl-kmod.spec, 1.134, 1.135

[Nicolas Viéville]

Author: nvieville

Update of /cvs/nonfree/rpms/wl-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv25068

Modified Files:
	wl-kmod.spec 
Added Files:
	wl-kmod-003_gcc_4.9_remove_TIME_DATE_macros.patch 
Log Message:
* Sun Oct 18 2015 Nicolas Viéville <nicolas.vieville at univ-valenciennes.fr> - 6.30.223.271-3
- Re-add patch to remove __DATE__ and __TIME__ macros for gcc >= 4.9 in order to allow
  reproducible builds - thanks to Tim Thomas


wl-kmod-003_gcc_4.9_remove_TIME_DATE_macros.patch:
 wl_linux.c |    9 +++++++++
 1 file changed, 9 insertions(+)

--- NEW FILE wl-kmod-003_gcc_4.9_remove_TIME_DATE_macros.patch ---
diff -Naur hybrid-v35_64-nodebug-pcoem-6_30_223_271.orig/src/wl/sys/wl_linux.c hybrid-v35_64-nodebug-pcoem-6_30_223_271/src/wl/sys/wl_linux.c
--- hybrid-v35_64-nodebug-pcoem-6_30_223_271.orig/src/wl/sys/wl_linux.c	2015-10-17 18:26:48.174207806 +0200
+++ hybrid-v35_64-nodebug-pcoem-6_30_223_271/src/wl/sys/wl_linux.c	2015-10-18 13:28:13.013818788 +0200
@@ -724,7 +724,11 @@
 		WL_ALL_PASSIVE_ENAB(wl) ?  ", Passive Mode" : "", EPI_VERSION_STR);
 
 #ifdef BCMDBG
+#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 9)
 	printf(" (Compiled in " SRCBASE " at " __TIME__ " on " __DATE__ ")");
+#else 
+	printf(" (Compiled in " SRCBASE ")");
+#endif 
 #endif 
 	printf("\n");
 
@@ -2053,8 +2057,13 @@
 void
 wl_dump_ver(wl_info_t *wl, struct bcmstrbuf *b)
 {
+#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 9)
 	bcm_bprintf(b, "wl%d: %s %s version %s\n", wl->pub->unit,
 		__DATE__, __TIME__, EPI_VERSION_STR);
+#else
+	bcm_bprintf(b, "wl%d: version %s\n", wl->pub->unit,
+		EPI_VERSION_STR);
+#endif
 }
 
 #if defined(BCMDBG)


Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/devel/wl-kmod.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- wl-kmod.spec	18 Oct 2015 00:31:54 -0000	1.134
+++ wl-kmod.spec	18 Oct 2015 11:44:45 -0000	1.135
@@ -7,7 +7,7 @@
 
 Name:       wl-kmod
 Version:    6.30.223.271
-Release:    2%{?dist}
+Release:    3%{?dist}
 Summary:    Kernel module for Broadcom wireless devices
 Group:      System Environment/Kernel
 License:    Redistributable, no modification permitted
@@ -17,6 +17,7 @@
 Source11:   wl-kmod-kmodtool-excludekernel-filterfile
 Patch0:     wl-kmod-001_wext_workaround.patch
 Patch1:     wl-kmod-002_kernel_3.18_null_pointer.patch
+Patch2:     wl-kmod-003_gcc_4.9_remove_TIME_DATE_macros.patch
 
 BuildRequires:  %{_bindir}/kmodtool
 
@@ -57,6 +58,7 @@
 %endif
 %patch0  -p1 -b .wext_workaround.patch
 %patch1  -p1 -b .kernel_3.18_null_pointer.patch
+%patch2  -p1 -b .gcc_4.9_remove_TIME_DATE_macros
 popd
 
 for kernel_version in %{?kernel_versions} ; do
@@ -86,6 +88,10 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Sun Oct 18 2015 Nicolas Viéville <nicolas.vieville at univ-valenciennes.fr> - 6.30.223.271-3
+- Re-add patch to remove __DATE__ and __TIME__ macros for gcc >= 4.9 in order to allow
+  reproducible builds - thanks to Tim Thomas
+
 * Sat Oct 17 2015 Nicolas Viéville <nicolas.vieville at univ-valenciennes.fr> - 6.30.223.271-2
 - Re-add patch for kernel >= 3.18