wok-stable rev 3659

Hack coreutils compile
author Pascal Bellard <pascal.bellard@slitaz.org>
date Tue Jul 07 20:54:42 2009 +0200 (2009-07-07)
parents 250b023ab932
children 442f111e41ae
files coreutils/receipt coreutils/stuff/ls.u
line diff
     1.1 --- a/coreutils/receipt	Tue Jul 07 19:03:50 2009 +0200
     1.2 +++ b/coreutils/receipt	Tue Jul 07 20:54:42 2009 +0200
     1.3 @@ -19,11 +19,17 @@
     1.4  	# NOTE: There does not seem to be a problem with sigcontext.h in Linux 2.6.29.3
     1.5  
     1.6  	# Hack to fix ls: expected specifier-qualifier-list before '__u64'
     1.7 -	# We are not patching the original file, just fake to compile
     1.8 -	# coreutils.
     1.9 -	# rm -f /usr/include/asm/sigcontext.h.bak
    1.10 -	# mv /usr/include/asm/sigcontext.h /usr/include/asm/sigcontext.h.bak || exit 1
    1.11 -	# cp ../stuff/sigcontext.h /usr/include/asm
    1.12 +	while read patch_file; do
    1.13 +		if [ -f done.$patch_file ]; then
    1.14 +			echo "Skipping $patch_file"
    1.15 +			continue
    1.16 +		fi
    1.17 +		echo "Apply $patch_file"
    1.18 +		patch -p1 < ../stuff/$patch_file || return 1
    1.19 +		touch done.$patch_file
    1.20 +	done <<EOT
    1.21 +ls.u
    1.22 +EOT
    1.23  	
    1.24  	sed -i 's/1.10a/1.10.2/' configure.ac || exit 1
    1.25  	sed -i 's/dist-xz/dist-lzma/' configure.ac || exit 1
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/coreutils/stuff/ls.u	Tue Jul 07 20:54:42 2009 +0200
     2.3 @@ -0,0 +1,10 @@
     2.4 +--- coreutils-7.4/src/ls.c
     2.5 ++++ coreutils-7.4/src/ls.c
     2.6 +@@ -63,6 +63,7 @@
     2.7 + #include <grp.h>
     2.8 + #include <pwd.h>
     2.9 + #include <getopt.h>
    2.10 ++#include <asm/types.h>
    2.11 + #include <signal.h>
    2.12 + #include <selinux/selinux.h>
    2.13 + #include <wchar.h>