From da5fbe4b757ee5f89d405a2830a9b73cb96ab03d Mon Sep 17 00:00:00 2001 From: midipix Date: Mon, 1 Jun 2015 12:58:25 -0400 Subject: coreutils-8.23: updated patch. + bypass configure's wrong assumptions (and bad conclusions) when cross-compiling. + gnulib.cache was inspired by advice from sortie, author of the sortix operating system. + fs.h: test for __midipix__ rather than __MIDIPIX (cf. cbb-gcc-4.6.4, commit f9ba0c). signed-off by Z. Gilboa; see copying.midipix (9cd0746c) for additional information. --- coreutils-8.23.midipix.patch | 170 ++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 158 insertions(+), 12 deletions(-) (limited to 'coreutils-8.23.midipix.patch') diff --git a/coreutils-8.23.midipix.patch b/coreutils-8.23.midipix.patch index bbe3170..199db47 100644 --- a/coreutils-8.23.midipix.patch +++ b/coreutils-8.23.midipix.patch @@ -1,6 +1,6 @@ -diff -ru a/build-aux/config.sub coreutils-8.23/build-aux/config.sub +diff -ru --new-file a/build-aux/config.sub b/build-aux/config.sub --- a/build-aux/config.sub 2014-06-25 04:43:35.000000000 -0400 -+++ coreutils-8.23/build-aux/config.sub 2015-05-29 00:05:01.499527002 -0400 ++++ b/build-aux/config.sub 2015-06-01 10:19:57.431041185 -0400 @@ -795,6 +795,9 @@ microblaze*) basic_machine=microblaze-xilinx @@ -20,10 +20,19 @@ diff -ru a/build-aux/config.sub coreutils-8.23/build-aux/config.sub | -linux-newlib* | -linux-musl* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ -diff -ru a/configure coreutils-8.23/configure +diff -ru --new-file a/configure b/configure --- a/configure 2014-07-18 18:07:39.000000000 -0400 -+++ coreutils-8.23/configure 2015-05-29 13:09:12.583782762 -0400 -@@ -66789,3 +66789,9 @@ ++++ b/configure 2015-06-01 12:42:55.874926255 -0400 +@@ -14,6 +14,8 @@ + ## M4sh Initialization. ## + ## -------------------- ## + ++. $(dirname $0)/./gnulib.cache || exit 2 ++ + # Be more Bourne compatible + DUALCASE=1; export DUALCASE # for MKS sh + if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : +@@ -66789,3 +66791,11 @@ $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi @@ -32,11 +41,148 @@ diff -ru a/configure coreutils-8.23/configure + mkdir -p man; + for f in $srcdir/src/*.c; do src=$(basename $f); doc="${src%.*}"; echo $doc; touch man/$doc.1; done + for f in dir sha1sum sha224sum sha256sum sha384sum sha512sum vdir; do touch man/$f.1; done ++ ++ sed -i -e 's/@cross_compiling@/'$cross_compiling'/g' Makefile || exit 2 +fi -diff -ru a/Makefile.in coreutils-8.23/Makefile.in +diff -ru --new-file a/gnulib.cache b/gnulib.cache +--- a/gnulib.cache 1969-12-31 19:00:00.000000000 -0500 ++++ b/gnulib.cache 2015-06-01 10:24:06.811037844 -0400 +@@ -0,0 +1,122 @@ ++# provide gnulib with information about modern systems ++export ac_cv_func_calloc_0_nonnull=yes ++export ac_cv_func_chown_works=yes ++export ac_cv_func_getgroups_works=yes ++export ac_cv_func_malloc_0_nonnull=yes ++export gl_cv_func_cbrtl_ieee=yes ++export gl_cv_func_ceilf_ieee=yes ++export gl_cv_func_ceil_ieee=yes ++export gl_cv_func_ceill_ieee=yes ++export gl_cv_func_chown_ctime_works=yes ++export gl_cv_func_chown_slash_works=yes ++export gl_cv_func_exp2l_ieee=yes ++export gl_cv_func_expm1_ieee=yes ++export gl_cv_func_fcntl_f_dupfd_works=yes ++export gl_cv_func_fdopendir_works=yes ++export gl_cv_func_floorf_ieee=yes ++export gl_cv_func_fflush_stdin=yes ++export gl_cv_func_fmaf_works=yes ++export gl_cv_func_fmal_works=yes ++export gl_cv_func_fma_works=yes ++export gl_cv_func_fmodf_ieee=yes ++export gl_cv_func_fmod_ieee=yes ++export gl_cv_func_fmodl_ieee=yes ++export gl_cv_func_fpurge_works=yes ++export gl_cv_func_fseeko=yes ++export gl_cv_func_futimens_works=yes ++export gl_cv_func_futimesat_works=yes ++export gl_cv_func_getgroups_works=yes ++export gl_cv_func_gettimeofday_clobber=no ++export gl_cv_func_hypotf_ieee=yes ++export gl_cv_func_hypotl_ieee=yes ++export gl_cv_func_hypot_ieee=yes ++export gl_cv_func_isfinitel_works=yes ++export gl_cv_func_isnanl_works=yes ++export gl_cv_func_linkat_slash=yes ++export gl_cv_func_link_works=yes ++export gl_cv_func_log10f_ieee=yes ++export gl_cv_func_log10_ieee=yes ++export gl_cv_func_log1pf_ieee=yes ++export gl_cv_func_log1p_ieee=yes ++export gl_cv_func_log1pl_ieee=yes ++export gl_cv_func_log2f_ieee=yes ++export gl_cv_func_log2_ieee=yes ++export gl_cv_func_logf_ieee=yes ++export gl_cv_func_log_ieee=yes ++export gl_cv_func_lstat_dereferences_slashed_symlink=yes ++export gl_cv_func_mbrlen_empty_input=yes ++export gl_cv_func_mbrtowc_empty_input=yes ++export gl_cv_func_memchr_works=yes ++export gl_cv_func_memmem_works_fast=yes ++export gl_cv_func_mkdir_trailing_dot_works=yes ++export gl_cv_func_mkdir_trailing_slash_works=yes ++export gl_cv_func_mkfifo_works=yes ++export gl_cv_func_mknod_works=yes ++export gl_cv_func_modff_ieee=yes ++export gl_cv_func_modf_ieee=yes ++export gl_cv_func_modfl_ieee=yes ++export gl_cv_func_nanosleep=yes ++export gl_cv_func_open_directory_works=yes ++export gl_cv_func_perror_works=yes ++export gl_cv_func_printf_directive_a=yes ++export gl_cv_func_printf_directive_f=yes ++export gl_cv_func_printf_directive_n=yes ++export gl_cv_func_printf_enomem=yes ++export gl_cv_func_printf_flag_zero=yes ++export gl_cv_func_printf_infinite_long_double=yes ++export gl_cv_func_printf_infinite=yes ++export gl_cv_func_printf_sizes_c99=yes ++export gl_cv_func_pselect_detects_ebadf=yes ++export gl_cv_func_ptsname_sets_errno=yes ++export gl_cv_func_readlink_works=yes ++export gl_cv_func_realpath_works=yes ++export gl_cv_func_remainderf_ieee=yes ++export gl_cv_func_remainder_ieee=yes ++export gl_cv_func_remainderl_ieee=yes ++export gl_cv_func_rename_dest_works=yes ++export gl_cv_func_rename_link_works=yes ++export gl_cv_func_rename_slash_dst_works=yes ++export gl_cv_func_rename_slash_src_works=yes ++export gl_cv_func_rmdir_works=yes ++export gl_cv_func_roundf_ieee=yes ++export gl_cv_func_round_ieee=yes ++export gl_cv_func_select_detects_ebadf=yes ++export gl_cv_func_setenv_works=yes ++export gl_cv_func_signbit_gcc=yes ++export gl_cv_func_signbit=yes ++export gl_cv_func_sleep_works=yes ++export gl_cv_func_snprintf_directive_n=yes ++export gl_cv_func_snprintf_retval_c99=yes ++export gl_cv_func_snprintf_truncation_c99=yes ++export gl_cv_func_stat_dir_slash=yes ++export gl_cv_func_stat_file_slash=yes ++export gl_cv_func_stpncpy=yes ++export gl_cv_func_strcasestr_linear=yes ++export gl_cv_func_strchrnul_works=yes ++export gl_cv_func_strerror_0_works=yes ++export gl_cv_func_strstr_linear=yes ++export gl_cv_func_strtod_works=yes ++export gl_cv_func_svid_putenv=yes ++export gl_cv_func_symlink_works=yes ++export gl_cv_func_tdelete_works=yes ++export gl_cv_func_truncf_ieee=yes ++export gl_cv_func_trunc_ieee=yes ++export gl_cv_func_truncl_ieee=yes ++export gl_cv_func_tzset_clobber=no ++export gl_cv_func_ungetc_works=yes ++export gl_cv_func_unlink_honors_slashes=yes ++export gl_cv_func_unsetenv_works=yes ++export gl_cv_func_usleep_works=yes ++export gl_cv_func_utimensat_works=yes ++export gl_cv_func_vsnprintf_posix=yes ++export gl_cv_func_vsnprintf_zerosize_c99=yes ++export gl_cv_func_vsprintf_posix=yes ++export gl_cv_func_wcwidth_works=yes ++export gl_cv_func_working_getdelim=yes ++export gl_cv_func_working_mkstemp=yes ++export gl_cv_func_working_mktime=yes ++export gl_cv_func_working_strerror=yes ++export ac_cv_func___fseterr=yes ++export gl_cv_func_getcwd_null=yes ++export gl_cv_struct_dirent_d_ino=yes ++export ac_cv_func_strnlen_working=yes +diff -ru --new-file a/Makefile.in b/Makefile.in --- a/Makefile.in 2014-07-18 18:22:24.000000000 -0400 -+++ coreutils-8.23/Makefile.in 2015-05-29 00:07:07.787529783 -0400 -@@ -14061,6 +14061,10 @@ ++++ b/Makefile.in 2015-06-01 12:03:29.274957961 -0400 +@@ -4911,6 +4911,8 @@ + $(bin_SCRIPTS) \ + $(EXTRA_PROGRAMS) + ++CROSS_COMPILE = @cross_compiling@ ++ + pm = progs-makefile + pr = progs-readme + @CROSS_COMPILING_FALSE@cu_install_program = src/ginstall +@@ -14061,6 +14063,10 @@ # Include the generated man dependencies. @AMDEP_TRUE@@am__include@ man/dynamic-deps.mk @@ -47,7 +193,7 @@ diff -ru a/Makefile.in coreutils-8.23/Makefile.in .x.1: $(AM_V_GEN)name=`echo $@ | sed 's|.*/||; s|\.1$$||'` || exit 1; \ case $$name in \ -@@ -14086,6 +14090,8 @@ +@@ -14086,6 +14092,8 @@ && chmod a-w $@-t \ && mv $@-t $@ .PHONY: check-root @@ -56,15 +202,15 @@ diff -ru a/Makefile.in coreutils-8.23/Makefile.in check-root: $(MAKE) check TESTS='$(root_tests)' SUBDIRS=. -diff -ru a/src/fs.h coreutils-8.23/src/fs.h +diff -ru --new-file a/src/fs.h b/src/fs.h --- a/src/fs.h 2014-07-18 14:33:26.000000000 -0400 -+++ coreutils-8.23/src/fs.h 2015-05-29 00:05:46.219527986 -0400 ++++ b/src/fs.h 2015-06-01 10:19:57.475041184 -0400 @@ -2,7 +2,7 @@ Please send additions to bug-coreutils@gnu.org and meskes@debian.org. This file is generated automatically from ./src/stat.c. */ -#if defined __linux__ -+#if defined __linux__ || defined __MIDIPIX ++#if defined __linux__ || defined __midipix__ # define S_MAGIC_ADFS 0xADF5 # define S_MAGIC_AFFS 0xADFF # define S_MAGIC_AFS 0x5346414F -- cgit v1.2.3