fakeroot: fix musl.
This commit is contained in:
parent
bd8849b510
commit
445968234f
4 changed files with 75 additions and 1 deletions
20
srcpkgs/fakeroot/patches/fakeroot-hide-dlsym-errors.patch
Normal file
20
srcpkgs/fakeroot/patches/fakeroot-hide-dlsym-errors.patch
Normal file
|
@ -0,0 +1,20 @@
|
|||
it's normal that the acl_* symbols are not found if the application
|
||||
is not linked against -lacl. these errors harmless, but mighty
|
||||
annoying.
|
||||
|
||||
--- libfakeroot.c.orig 2014-03-07 11:20:26.120532847 +0200
|
||||
+++ libfakeroot.c 2014-03-07 11:21:26.486872482 +0200
|
||||
@@ -258,10 +258,12 @@
|
||||
/* clear dlerror() just in case dlsym() legitimately returns NULL */
|
||||
msg = dlerror();
|
||||
*(next_wrap[i].doit)=dlsym(get_libc(), next_wrap[i].name);
|
||||
- if ( (msg = dlerror()) != NULL){
|
||||
+#ifdef LIBFAKEROOT_DEBUGGING
|
||||
+ if ( fakeroot_debug && (msg = dlerror()) != NULL) {
|
||||
fprintf (stderr, "dlsym(%s): %s\n", next_wrap[i].name, msg);
|
||||
/* abort ();*/
|
||||
}
|
||||
+#endif
|
||||
}
|
||||
}
|
||||
|
17
srcpkgs/fakeroot/patches/fakeroot-no64.patch
Normal file
17
srcpkgs/fakeroot/patches/fakeroot-no64.patch
Normal file
|
@ -0,0 +1,17 @@
|
|||
--- libfakeroot.c.orig
|
||||
+++ libfakeroot.c
|
||||
@@ -81,12 +81,14 @@
|
||||
#define SEND_STAT64(a,b,c) send_stat64(a,b,c)
|
||||
#define SEND_GET_STAT(a,b) send_get_stat(a,b)
|
||||
#define SEND_GET_STAT64(a,b) send_get_stat64(a,b)
|
||||
+#define SEND_GET_XATTR(a,b,c) send_get_xattr(a,b,c)
|
||||
#define SEND_GET_XATTR64(a,b,c) send_get_xattr64(a,b,c)
|
||||
#else
|
||||
#define SEND_STAT(a,b,c) send_stat(a,b)
|
||||
#define SEND_STAT64(a,b,c) send_stat64(a,b)
|
||||
#define SEND_GET_STAT(a,b) send_get_stat(a)
|
||||
#define SEND_GET_STAT64(a,b) send_get_stat64(a)
|
||||
+#define SEND_GET_XATTR(a,b,c) send_get_xattr(a,b)
|
||||
#define SEND_GET_XATTR64(a,b,c) send_get_xattr64(a,b)
|
||||
#endif
|
||||
|
34
srcpkgs/fakeroot/patches/fakeroot-stdint.patch
Normal file
34
srcpkgs/fakeroot/patches/fakeroot-stdint.patch
Normal file
|
@ -0,0 +1,34 @@
|
|||
--- faked.c.orig
|
||||
+++ faked.c
|
||||
@@ -514,11 +514,11 @@
|
||||
|
||||
#ifdef FAKEROOT_DB_PATH
|
||||
if (find_path(i->buf.dev, i->buf.ino, roots, path))
|
||||
- fprintf(f,"mode=%llo,uid=%llu,gid=%llu,nlink=%llu,rdev=%llu %s\n",
|
||||
+ fprintf(f,"mode=%"PRIo64",uid=%"PRIu64",gid=%"PRIu64",nlink=%"PRIu64",rdev=%"PRIu64" %s\n",
|
||||
(uint64_t) i->buf.mode,(uint64_t) i->buf.uid,(uint64_t) i->buf.gid,
|
||||
(uint64_t) i->buf.nlink,(uint64_t) i->buf.rdev,path);
|
||||
#else
|
||||
- fprintf(f,"dev=%llx,ino=%llu,mode=%llo,uid=%llu,gid=%llu,nlink=%llu,rdev=%llu\n",
|
||||
+ fprintf(f,"dev=%"PRIx64",ino=%"PRIu64",mode=%"PRIo64",uid=%"PRIu64",gid=%"PRIu64",nlink=%"PRIu64",rdev=%"PRIu64"\n",
|
||||
(uint64_t) i->buf.dev,(uint64_t) i->buf.ino,(uint64_t) i->buf.mode,
|
||||
(uint64_t) i->buf.uid,(uint64_t) i->buf.gid,(uint64_t) i->buf.nlink,
|
||||
(uint64_t) i->buf.rdev);
|
||||
@@ -544,7 +544,7 @@
|
||||
|
||||
while(1){
|
||||
#ifdef FAKEROOT_DB_PATH
|
||||
- r=scanf("mode=%llo,uid=%llu,gid=%llu,nlink=%llu,rdev=%llu "DB_PATH_SCAN"\n",
|
||||
+ r=scanf("mode=%"PRIo64",uid=%"PRIu64",gid=%"PRIu64",nlink=%"PRIu64",rdev=%"PRIu64" "DB_PATH_SCAN"\n",
|
||||
&stmode, &stuid, &stgid, &stnlink, &strdev, &path);
|
||||
if (r != 6)
|
||||
break;
|
||||
@@ -559,7 +559,7 @@
|
||||
stdev = path_st.st_dev;
|
||||
stino = path_st.st_ino;
|
||||
#else
|
||||
- r=scanf("dev=%llx,ino=%llu,mode=%llo,uid=%llu,gid=%llu,nlink=%llu,rdev=%llu\n",
|
||||
+ r=scanf("dev=%"PRIx64",ino=%"PRIu64",mode=%"PRIo64",uid=%"PRIu64",gid=%"PRIu64",nlink=%"PRIu64",rdev=%"PRIu64"\n",
|
||||
&stdev, &stino, &stmode, &stuid, &stgid, &stnlink, &strdev);
|
||||
if (r != 7)
|
||||
break;
|
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'fakeroot'
|
||||
pkgname=fakeroot
|
||||
version=1.20.2
|
||||
revision=2
|
||||
revision=3
|
||||
lib32disabled=yes
|
||||
build_style=gnu-configure
|
||||
makedepends="acl-devel libcap-devel"
|
||||
|
@ -12,6 +12,9 @@ homepage="http://packages.debian.org/fakeroot"
|
|||
license="GPL-3"
|
||||
distfiles="${DEBIAN_SITE}/main/f/fakeroot/${pkgname}_${version}.orig.tar.bz2"
|
||||
checksum=7c0a164d19db3efa9e802e0fc7cdfeff70ec6d26cdbdc4338c9c2823c5ea230c
|
||||
case "$XBPS_TARGET_MACHINE" in
|
||||
*-musl) CFLAGS="-D_STAT_VER=0" ;;
|
||||
esac
|
||||
|
||||
post_install() {
|
||||
# Use /bin/sh shebang.
|
||||
|
|
Loading…
Reference in a new issue