tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
checkinstall: fix build with glibc-2.19
Vladimír Čunát
12 years ago
28d992bf
db9d204d
+22
2 changed files
expand all
collapse all
unified
split
pkgs
tools
package-management
checkinstall
default.nix
readlink-types.patch
+3
pkgs/tools/package-management/checkinstall/default.nix
···
29
30
# Fix a `conflicting types for 'scandir'' error on Glibc 2.11.
31
./scandir.patch
0
0
0
32
]
33
34
++ stdenv.lib.optional (stdenv.system == "x86_64-linux")
···
29
30
# Fix a `conflicting types for 'scandir'' error on Glibc 2.11.
31
./scandir.patch
32
+
33
+
# Fix a `conflicting types for 'readlink'' error since Glibc 2.19
34
+
./readlink-types.patch
35
]
36
37
++ stdenv.lib.optional (stdenv.system == "x86_64-linux")
+19
pkgs/tools/package-management/checkinstall/readlink-types.patch
···
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
···
1
+
Extracted from Arch's patch
2
+
https://projects.archlinux.org/svntogit/community.git/tree/trunk/build-fix.patch?h=packages/checkinstall
3
+
diff -wbBur checkinstall-1.6.2/installwatch/installwatch.c checkinstall-1.6.2.my/installwatch/installwatch.c
4
+
--- checkinstall-1.6.2/installwatch/installwatch.c 2008-11-16 19:20:53.000000000 +0300
5
+
+++ checkinstall-1.6.2.my/installwatch/installwatch.c 2010-01-15 18:55:50.112716628 +0300
6
+
@@ -2938,13 +2938,8 @@
7
+
return result;
8
+
}
9
+
10
+
-#if (GLIBC_MINOR <= 4)
11
+
-int readlink(const char *path,char *buf,size_t bufsiz) {
12
+
- int result;
13
+
-#else
14
+
ssize_t readlink(const char *path,char *buf,size_t bufsiz) {
15
+
ssize_t result;
16
+
-#endif
17
+
instw_t instw;
18
+
int status;
19
+