diff --git a/pkgs/development/libraries/glibc-2.11/common.nix b/pkgs/development/libraries/glibc-2.11/common.nix index ed667be10ef..b955bb31a45 100644 --- a/pkgs/development/libraries/glibc-2.11/common.nix +++ b/pkgs/development/libraries/glibc-2.11/common.nix @@ -49,6 +49,9 @@ stdenv.mkDerivation ({ /* Make sure `nscd' et al. are linked against `libssp'. */ ./stack-protector-link.patch + + /* MOD_NANO definition, for ntp (taken from glibc upstream) */ + ./mod_nano.patch ]; configureFlags = [ diff --git a/pkgs/development/libraries/glibc-2.11/mod_nano.patch b/pkgs/development/libraries/glibc-2.11/mod_nano.patch new file mode 100644 index 00000000000..2fb35b3df38 --- /dev/null +++ b/pkgs/development/libraries/glibc-2.11/mod_nano.patch @@ -0,0 +1,31 @@ +commit 89b432d7a5befb85048c97e881b2106e8df58e43 +Author: Ulrich Drepper +Date: Sun Nov 22 10:23:12 2009 -0800 + + Fix up a bit more for recent API changes. + +diff --git a/sysdeps/unix/sysv/linux/sys/timex.h b/sysdeps/unix/sysv/linux/sys/timex.h +index 5f10c7f..88b87f1 100644 +--- a/sysdeps/unix/sysv/linux/sys/timex.h ++++ b/sysdeps/unix/sysv/linux/sys/timex.h +@@ -85,6 +85,9 @@ struct timex + #define MOD_TIMECONST ADJ_TIMECONST + #define MOD_CLKB ADJ_TICK + #define MOD_CLKA ADJ_OFFSET_SINGLESHOT /* 0x8000 in original */ ++#define MOD_TAI ADJ_TAI ++#define MOD_MICRO ADJ_MICRO ++#define MOD_NANO ADJ_NANO + + + /* Status codes (timex.status) */ +@@ -108,8 +111,9 @@ struct timex + #define STA_MODE 0x4000 /* mode (0 = PLL, 1 = FLL) (ro) */ + #define STA_CLK 0x8000 /* clock source (0 = A, 1 = B) (ro) */ + ++/* Read-only bits */ + #define STA_RONLY (STA_PPSSIGNAL | STA_PPSJITTER | STA_PPSWANDER | \ +- STA_PPSERROR | STA_CLOCKERR) /* read-only bits */ ++ STA_PPSERROR | STA_CLOCKERR | STA_NANO | STA_MODE | STA_CLK) + + /* Clock states (time_state) */ + #define TIME_OK 0 /* clock synchronized, no leap second */