Author: aurel32
Date: 2013-05-07 21:47:59 +0000 (Tue, 07 May 2013)
New Revision: 5554
Added:
glibc-package/trunk/debian/patches/any/submitted-sys-param-h-DEV_BSIZE.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
* patches/any/submitted-sys-param-h-DEV_BSIZE.diff: New patch to fix
conflict with kFreeBSD kernel headers.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2013-05-07 21:33:22 UTC (rev
5553)
+++ glibc-package/trunk/debian/changelog 2013-05-07 21:47:59 UTC (rev
5554)
@@ -1,8 +1,13 @@
eglibc (2.17-2) UNRELEASED; urgency=low
+ [ Adam Conrad ]
* debian/patches/any/unsubmitted-cloexec-conditional.diff: Catch yet
another unconditional O_CLOEXEC and conditionalize it for freebsd.
+ [ Aurelien Jarno ]
+ * patches/any/submitted-sys-param-h-DEV_BSIZE.diff: New patch to fix
+ conflict with kFreeBSD kernel headers.
+
-- Adam Conrad <[email protected]> Tue, 07 May 2013 13:58:05 -0600
eglibc (2.17-1) unstable; urgency=low
Added:
glibc-package/trunk/debian/patches/any/submitted-sys-param-h-DEV_BSIZE.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/submitted-sys-param-h-DEV_BSIZE.diff
(rev 0)
+++ glibc-package/trunk/debian/patches/any/submitted-sys-param-h-DEV_BSIZE.diff
2013-05-07 21:47:59 UTC (rev 5554)
@@ -0,0 +1,21 @@
+2013-05-07 Aurelien Jarno <[email protected]>
+
+ * misc/sys/param.h(DEV_BSIZE): Define only if not already defined.
+
+diff --git a/misc/sys/param.h b/misc/sys/param.h
+index 5e6353d..6a0b5d3 100644
+--- a/misc/sys/param.h
++++ b/misc/sys/param.h
+@@ -71,7 +71,9 @@
+
+
+ /* Unit of `st_blocks'. */
++#ifndef DEV_BSIZE
+ #define DEV_BSIZE 512
++#endif
+
+
+ /* Bit map related macros. */
+--
+1.7.10.4
+
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2013-05-07 21:33:22 UTC (rev
5553)
+++ glibc-package/trunk/debian/patches/series 2013-05-07 21:47:59 UTC (rev
5554)
@@ -235,3 +235,4 @@
any/unsubmitted-ldso-machine-mismatch.diff
any/cvs-use-glibc-wchar.diff
any/submitted-setfsid-wur.diff
+any/submitted-sys-param-h-DEV_BSIZE.diff
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
