public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

glibc: improve nscd version check after e316672dcb

Browse Source
This commit is contained in:
Vladimír Čunát 2014-11-11 11:04:10 +01:00
parent 65221567c1
commit 975a822778
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/libraries/glibc/common.nix
View File

@ -69,8 +69,11 @@ stdenv.mkDerivation ({
+ '' + ''
echo "LDFLAGS-nscd += -static-libgcc" >> nscd/Makefile echo "LDFLAGS-nscd += -static-libgcc" >> nscd/Makefile
'' ''
# Replace the date and time in nscd by $out. # Replace the date and time in nscd by a prefix of $out.
# It is used as a protocol compatibility check. # 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} \ cat ${./glibc-remove-datetime-from-nscd.patch} \
| sed "s,@out@,$out," | patch -p1 | sed "s,@out@,$out," | patch -p1

2
pkgs/development/libraries/glibc/glibc-remove-datetime-from-nscd.patch
View File

@ -5,7 +5,7 @@
/* We use this to make sure the receiver is the same. */ /* We use this to make sure the receiver is the same. */
-static const char compilation[21] = __DATE__ " " __TIME__; -static const char compilation[21] = __DATE__ " " __TIME__;
+static const char compilation[21] = "@out@"; +static const char compilation[] = "@out@";
/* Statistic data for one database. */ /* Statistic data for one database. */
struct dbstat struct dbstat