diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-11-11 11:04:10 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-11-11 11:06:57 +0100 |
| commit | 975a822778896c086438e22532fe58652c019499 (patch) | |
| tree | 6b86ca2875ec5f773f10761af6e926730165a4bf /pkgs | |
| parent | 65221567c12eb20d1254f6bc1b573e126af43645 (diff) | |
| download | nixlib-975a822778896c086438e22532fe58652c019499.tar nixlib-975a822778896c086438e22532fe58652c019499.tar.gz nixlib-975a822778896c086438e22532fe58652c019499.tar.bz2 nixlib-975a822778896c086438e22532fe58652c019499.tar.lz nixlib-975a822778896c086438e22532fe58652c019499.tar.xz nixlib-975a822778896c086438e22532fe58652c019499.tar.zst nixlib-975a822778896c086438e22532fe58652c019499.zip | |
glibc: improve nscd version check after e316672dcb
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/glibc/common.nix | 7 | ||||
| -rw-r--r-- | pkgs/development/libraries/glibc/glibc-remove-datetime-from-nscd.patch | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 2559dea26539..da1d4f08fa2f 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -69,8 +69,11 @@ stdenv.mkDerivation ({ + '' echo "LDFLAGS-nscd += -static-libgcc" >> nscd/Makefile '' - # Replace the date and time in nscd by $out. - # It is used as a protocol compatibility check. + # Replace the date and time in nscd by a prefix of $out. + # It is used as a protocol compatibility check. + # Note: the size of the struct changes, but using only a part + # would break hash-rewriting. When receiving stats it does check + # that the struct sizes match and can't cause overflow or something. + '' cat ${./glibc-remove-datetime-from-nscd.patch} \ | sed "s,@out@,$out," | patch -p1 diff --git a/pkgs/development/libraries/glibc/glibc-remove-datetime-from-nscd.patch b/pkgs/development/libraries/glibc/glibc-remove-datetime-from-nscd.patch index 0a5456ea5c42..db010e62366b 100644 --- a/pkgs/development/libraries/glibc/glibc-remove-datetime-from-nscd.patch +++ b/pkgs/development/libraries/glibc/glibc-remove-datetime-from-nscd.patch @@ -5,7 +5,7 @@ /* We use this to make sure the receiver is the same. */ -static const char compilation[21] = __DATE__ " " __TIME__; -+static const char compilation[21] = "@out@"; ++static const char compilation[] = "@out@"; /* Statistic data for one database. */ struct dbstat |