diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-03-15 14:01:11 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-03-15 14:04:32 +0100 |
| commit | 82dc43c28b2703733cff0210a562879cf54e5d7e (patch) | |
| tree | a17f1da6756a8c8d0c8b8d9ffd8c8aa01ff66e7a /pkgs | |
| parent | 4c67972e9b35c429452652751d381b1db54cd172 (diff) | |
| download | nixlib-82dc43c28b2703733cff0210a562879cf54e5d7e.tar nixlib-82dc43c28b2703733cff0210a562879cf54e5d7e.tar.gz nixlib-82dc43c28b2703733cff0210a562879cf54e5d7e.tar.bz2 nixlib-82dc43c28b2703733cff0210a562879cf54e5d7e.tar.lz nixlib-82dc43c28b2703733cff0210a562879cf54e5d7e.tar.xz nixlib-82dc43c28b2703733cff0210a562879cf54e5d7e.tar.zst nixlib-82dc43c28b2703733cff0210a562879cf54e5d7e.zip | |
checkinstall: Make installwatch.so work with old Glibcs
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/package-management/checkinstall/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/package-management/checkinstall/use-old-memcpy.patch | 12 |
2 files changed, 16 insertions, 0 deletions
diff --git a/pkgs/tools/package-management/checkinstall/default.nix b/pkgs/tools/package-management/checkinstall/default.nix index aa935076eb98..a2b9c11eb09d 100644 --- a/pkgs/tools/package-management/checkinstall/default.nix +++ b/pkgs/tools/package-management/checkinstall/default.nix @@ -29,6 +29,10 @@ stdenv.mkDerivation { # Fix a `conflicting types for 'scandir'' error on Glibc 2.11. ./scandir.patch + + # Force use of old memcpy so that installwatch works on Glibc < + # 2.14. + ./use-old-memcpy.patch ]; buildInputs = [gettext]; diff --git a/pkgs/tools/package-management/checkinstall/use-old-memcpy.patch b/pkgs/tools/package-management/checkinstall/use-old-memcpy.patch new file mode 100644 index 000000000000..c8be7f0b5e26 --- /dev/null +++ b/pkgs/tools/package-management/checkinstall/use-old-memcpy.patch @@ -0,0 +1,12 @@ +diff -ru -x '*~' checkinstall-1.6.2-orig/installwatch/installwatch.c checkinstall-1.6.2/installwatch/installwatch.c +--- checkinstall-1.6.2-orig/installwatch/installwatch.c 2008-11-16 17:20:53.000000000 +0100 ++++ checkinstall-1.6.2/installwatch/installwatch.c 2013-03-15 13:50:12.717646381 +0100 +@@ -28,6 +28,8 @@ + * <mail@fredemmott.co.uk> + */ + ++asm (".symver memcpy, memcpy@GLIBC_2.2.5"); ++ + #include <sys/param.h> + #include <sys/types.h> + #include <sys/stat.h> |