wok-next rev 2586
busybox/basename: hack status
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Tue Apr 07 16:14:12 2009 +0000 (2009-04-07) |
parents | 3b9c9f5954e2 |
children | dc6ae334aef8 |
files | busybox-pam/receipt busybox/receipt busybox/stuff/busybox-1.12.0-basename.u |
line diff
1.1 --- a/busybox-pam/receipt Tue Apr 07 16:03:51 2009 +0000 1.2 +++ b/busybox-pam/receipt Tue Apr 07 16:14:12 2009 +0000 1.3 @@ -35,6 +35,7 @@ 1.4 paths.u 1.5 mkswap.u 1.6 install.u 1.7 +basename.u 1.8 EOT 1.9 cp $WOK/busybox/stuff/$SOURCE-$VERSION.config .config 1.10 sed -i 's/# CONFIG_PAM is not set/CONFIG_PAM=y/' .config
2.1 --- a/busybox/receipt Tue Apr 07 16:03:51 2009 +0000 2.2 +++ b/busybox/receipt Tue Apr 07 16:14:12 2009 +0000 2.3 @@ -33,6 +33,7 @@ 2.4 paths.u 2.5 mkswap.u 2.6 install.u 2.7 +basename.u 2.8 EOT 2.9 cp ../stuff/$PACKAGE-$VERSION.config .config 2.10 make oldconfig
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 3.2 +++ b/busybox/stuff/busybox-1.12.0-basename.u Tue Apr 07 16:14:12 2009 +0000 3.3 @@ -0,0 +1,11 @@ 3.4 +Basename may spuriously break build using 'set -e' 3.5 +--- busybox-1.12.0/coreutils/basename.c 3.6 ++++ busybox-1.12.0/coreutils/basename.c 3.7 +@@ -48,5 +48,6 @@ 3.8 + 3.9 + /* puts(s) will do, but we can do without stdio this way: */ 3.10 + s[m++] = '\n'; 3.11 +- return full_write(STDOUT_FILENO, s, m) == (ssize_t)m; 3.12 ++ full_write(STDOUT_FILENO, s, m); 3.13 ++ return 0; 3.14 + }