Skip to contentSkip to conversation

uclibc: synchronize bits/time.h with latest glibc

PATCH New Max Filippov 2 participants 2 messages Aug 15, 2014

lore
Share & tools
lore

Max Filippov

author
#0 lore raw

PATCH 1/1 uclibc: synchronize bits/time.h with latest glibc

This fixes NetworkManager build on uClibc.

Fixes:
http://autobuild.buildroot.net/results/d33/d33ed1c3bf1be7c8f8ea02590a770b0d29c7d9fa/

Backported from: e2cf30bb7543a99defd457226a39de8d8860fa9e

Signed-off-by Max Filippov <[email protected]>
---
 ...c-0003-bits-time.h-sync-with-latest-glibc.patch | 38 ++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 package/uclibc/7bf35c8b7d4a1f97174eb49f47f33946b282114c/uclibc-0003-bits-time.h-sync-with-latest-glibc.patch
package/uclibc/7bf35c8b7d4a1f97174eb49f47f33946b282114c/uclibc-0003-bits-time.h-sync-with-latest-glibc.patch new file +38 -0
new file mode 100644
index 0000000..de3fe13
@@ -0,0 +1,38 @@
+From e2cf30bb7543a99defd457226a39de8d8860fa9e Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <[email protected]>
+Date: Fri, 1 Aug 2014 04:16:12 -0400
+Subject: [PATCH] bits/time.h: sync with latest glibc
+
+Signed-off-by: Mike Frysinger <[email protected]>
+---
+ libc/sysdeps/linux/common/bits/time.h | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/libc/sysdeps/linux/common/bits/time.h b/libc/sysdeps/linux/common/bits/time.h
+index b397b60..c4269ae 100644
+--- a/libc/sysdeps/linux/common/bits/time.h
++++ b/libc/sysdeps/linux/common/bits/time.h
+@@ -1,5 +1,5 @@
+-/* System-dependent timing definitions.  Generic version.
+-   Copyright (C) 1996,1997,1999-2002,2003 Free Software Foundation, Inc.
++/* System-dependent timing definitions.  Linux version.
++   Copyright (C) 1996-2014 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+@@ -59,6 +59,12 @@
+ #   define CLOCK_REALTIME_COARSE	5
+ /* Monotonic system-wide clock, updated only on ticks.  */
+ #   define CLOCK_MONOTONIC_COARSE	6
++/* Monotonic system-wide clock that includes time spent in suspension.  */
++#   define CLOCK_BOOTTIME		7
++/* Like CLOCK_REALTIME but also wakes suspended system.  */
++#   define CLOCK_REALTIME_ALARM		8
++/* Like CLOCK_BOOTTIME but also wakes suspended system.  */
++#   define CLOCK_BOOTTIME_ALARM		9
+ 
+ /* Flag to indicate time is absolute.  */
+ #   define TIMER_ABSTIME		1
+-- 
+1.8.1.4
+
Signature · 1 line
1.8.1.4
#1 lore raw

PATCH 1/1 uclibc: synchronize bits/time.h with latest glibc

Hi Max,

Quoted 4 lines · Max Filippov

This fixes NetworkManager build on uClibc.

Fixes:
http://autobuild.buildroot.net/results/d33/d33ed1c3bf1be7c8f8ea02590a770b0d29c7d9fa/

This was fixed for network-manager locally by Peter in commit 7e33639ecf3 (network-manager: fix build on toolchains not exporting CLOCK_BOOTTIME (E.G. uClibc)). Patching Buildroot internal uClibc doesn't fix the problem for external uClibc toolchain, so we'll have to patch each package using these macros locally anyway.

Also, this patch applies only to the xtensa specific version of uClibc, which is a snapshot of uClibc master. Since this patch is already in uClibc master, why not simply advance the snapshot version to current master instead?

baruch

Quoted 51 lines

Backported from: e2cf30bb7543a99defd457226a39de8d8860fa9e

Signed-off-by Max Filippov <[email protected]>
---
 ...c-0003-bits-time.h-sync-with-latest-glibc.patch | 38 ++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 package/uclibc/7bf35c8b7d4a1f97174eb49f47f33946b282114c/uclibc-0003-bits-time.h-sync-with-latest-glibc.patch
package/uclibc/7bf35c8b7d4a1f97174eb49f47f33946b282114c/uclibc-0003-bits-time.h-sync-with-latest-glibc.patch new file +38 -0
new file mode 100644
index 0000000..de3fe13
@@ -0,0 +1,38 @@
+From e2cf30bb7543a99defd457226a39de8d8860fa9e Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <[email protected]>
+Date: Fri, 1 Aug 2014 04:16:12 -0400
+Subject: [PATCH] bits/time.h: sync with latest glibc
+
+Signed-off-by: Mike Frysinger <[email protected]>
+---
+ libc/sysdeps/linux/common/bits/time.h | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/libc/sysdeps/linux/common/bits/time.h b/libc/sysdeps/linux/common/bits/time.h
+index b397b60..c4269ae 100644
+--- a/libc/sysdeps/linux/common/bits/time.h
++++ b/libc/sysdeps/linux/common/bits/time.h
+@@ -1,5 +1,5 @@
+-/* System-dependent timing definitions.  Generic version.
+-   Copyright (C) 1996,1997,1999-2002,2003 Free Software Foundation, Inc.
++/* System-dependent timing definitions.  Linux version.
++   Copyright (C) 1996-2014 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+@@ -59,6 +59,12 @@
+ #   define CLOCK_REALTIME_COARSE	5
+ /* Monotonic system-wide clock, updated only on ticks.  */
+ #   define CLOCK_MONOTONIC_COARSE	6
++/* Monotonic system-wide clock that includes time spent in suspension.  */
++#   define CLOCK_BOOTTIME		7
++/* Like CLOCK_REALTIME but also wakes suspended system.  */
++#   define CLOCK_REALTIME_ALARM		8
++/* Like CLOCK_BOOTTIME but also wakes suspended system.  */
++#   define CLOCK_BOOTTIME_ALARM		9
+ 
+ /* Flag to indicate time is absolute.  */
+ #   define TIMER_ABSTIME		1
+-- 
+1.8.1.4
+
Signature · 3 lines
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -