mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-18 10:56:53 +00:00
d25aa3c8a5
* checkinstall: get rid of the RUNPATH in the LD_PRELOAD library so that it works with native Glibc (e.g. in VM builds). * debBuild: use our own checkinstall. In particular this allows us to build Debs on x86_64. svn path=/nixpkgs/trunk/; revision=13608
41 lines
1.1 KiB
Diff
41 lines
1.1 KiB
Diff
--- a/installwatch-0.7.0beta5/installwatch.c 2007-04-07 14:27:23.000000000 -0400
|
|
+++ b/installwatch-0.7.0beta5/installwatch.c 2007-04-07 14:25:06.000000000 -0400
|
|
@@ -84,7 +84,7 @@
|
|
static int (*true_open)(const char *, int, ...);
|
|
static DIR *(*true_opendir)(const char *);
|
|
static struct dirent *(*true_readdir)(DIR *dir);
|
|
-static int (*true_readlink)(const char*,char *,size_t);
|
|
+static ssize_t (*true_readlink)(const char*,char *,size_t);
|
|
static char *(*true_realpath)(const char *,char *);
|
|
static int (*true_rename)(const char *, const char *);
|
|
static int (*true_rmdir)(const char *);
|
|
@@ -546,7 +546,7 @@
|
|
struct utimbuf timbuf;
|
|
size_t truesz;
|
|
char linkpath[PATH_MAX+1];
|
|
- size_t linksz;
|
|
+ ssize_t linksz;
|
|
|
|
#if DEBUG
|
|
debug(2,"copy_path(%s,%s)\n",truepath,translroot);
|
|
@@ -1582,7 +1582,7 @@
|
|
struct stat reslvinfo;
|
|
instw_t iw;
|
|
char wpath[PATH_MAX+1];
|
|
- size_t wsz=0;
|
|
+ ssize_t wsz=0;
|
|
char linkpath[PATH_MAX+1];
|
|
|
|
|
|
@@ -2698,8 +2698,8 @@
|
|
return result;
|
|
}
|
|
|
|
-int readlink(const char *path,char *buf,size_t bufsiz) {
|
|
- int result;
|
|
+ssize_t readlink(const char *path,char *buf,size_t bufsiz) {
|
|
+ ssize_t result;
|
|
instw_t instw;
|
|
int status;
|
|
|