From 33aa9014cb9932f6f23a7ba512660dc7fe3c4615 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 12 Dec 2009 01:27:11 +0100 Subject: cross-compile on freeBSD, remove bzero --- package/xfsprogs/patches/patch-aclocal_m4 | 16 +++++++++++++ package/xfsprogs/patches/patch-fsr_xfs_fsr_c | 11 +++++++++ package/xfsprogs/patches/patch-libxfs_cache_c | 11 +++++++++ package/xfsprogs/patches/patch-repair_progress_c | 29 ++++++++++++++++++++++++ 4 files changed, 67 insertions(+) create mode 100644 package/xfsprogs/patches/patch-aclocal_m4 create mode 100644 package/xfsprogs/patches/patch-fsr_xfs_fsr_c create mode 100644 package/xfsprogs/patches/patch-libxfs_cache_c create mode 100644 package/xfsprogs/patches/patch-repair_progress_c (limited to 'package') diff --git a/package/xfsprogs/patches/patch-aclocal_m4 b/package/xfsprogs/patches/patch-aclocal_m4 new file mode 100644 index 000000000..62851935f --- /dev/null +++ b/package/xfsprogs/patches/patch-aclocal_m4 @@ -0,0 +1,16 @@ +--- xfsprogs-3.0.0.orig/aclocal.m4 2009-02-04 23:29:25.000000000 +0100 ++++ xfsprogs-3.0.0/aclocal.m4 2009-12-12 00:50:23.000000000 +0100 +@@ -148,11 +148,11 @@ AC_DEFUN([AC_PACKAGE_GLOBALS], + test -z "$INSTALL_GROUP" || pkg_group="$INSTALL_GROUP" + AC_SUBST(pkg_group) + +- pkg_distribution=`uname -s` ++ pkg_distribution=Linux + test -z "$DISTRIBUTION" || pkg_distribution="$DISTRIBUTION" + AC_SUBST(pkg_distribution) + +- pkg_platform=`uname -s | tr 'A-Z' 'a-z' | sed -e 's/irix64/irix/'` ++ pkg_platform=linux + test -z "$PLATFORM" || pkg_platform="$PLATFORM" + AC_SUBST(pkg_platform) + ]) diff --git a/package/xfsprogs/patches/patch-fsr_xfs_fsr_c b/package/xfsprogs/patches/patch-fsr_xfs_fsr_c new file mode 100644 index 000000000..9a305b9e5 --- /dev/null +++ b/package/xfsprogs/patches/patch-fsr_xfs_fsr_c @@ -0,0 +1,11 @@ +--- xfsprogs-3.0.0.orig/fsr/xfs_fsr.c 2009-02-04 23:29:25.000000000 +0100 ++++ xfsprogs-3.0.0/fsr/xfs_fsr.c 2009-12-12 00:53:17.000000000 +0100 +@@ -275,7 +275,7 @@ main(int argc, char **argv) + progname, mtab); + exit(1); + } +- bzero(&mntpref, sizeof(mntpref)); ++ memset(&mntpref, 0, sizeof(mntpref)); + if (S_ISDIR(sb.st_mode)) + mntpref.mnt_dir = argname; + else diff --git a/package/xfsprogs/patches/patch-libxfs_cache_c b/package/xfsprogs/patches/patch-libxfs_cache_c new file mode 100644 index 000000000..b1a2b1eb1 --- /dev/null +++ b/package/xfsprogs/patches/patch-libxfs_cache_c @@ -0,0 +1,11 @@ +--- xfsprogs-3.0.0.orig/libxfs/cache.c 2009-02-04 23:29:25.000000000 +0100 ++++ xfsprogs-3.0.0/libxfs/cache.c 2009-12-12 00:52:32.000000000 +0100 +@@ -582,7 +582,7 @@ cache_report( + cache->c_mrus[i].cm_count * 100 / cache->c_count); + + /* report hash bucket lengths */ +- bzero(hash_bucket_lengths, sizeof(hash_bucket_lengths)); ++ memset(hash_bucket_lengths, 0, sizeof(hash_bucket_lengths)); + + for (i = 0; i < cache->c_hashsize; i++) { + count = cache->c_hash[i].ch_count; diff --git a/package/xfsprogs/patches/patch-repair_progress_c b/package/xfsprogs/patches/patch-repair_progress_c new file mode 100644 index 000000000..19433b375 --- /dev/null +++ b/package/xfsprogs/patches/patch-repair_progress_c @@ -0,0 +1,29 @@ +--- xfsprogs-3.0.0.orig/repair/progress.c 2009-02-04 23:29:26.000000000 +0100 ++++ xfsprogs-3.0.0/repair/progress.c 2009-12-12 00:53:54.000000000 +0100 +@@ -117,7 +117,7 @@ init_progress_rpt (void) + malloc(sizeof(__uint64_t)*glob_agcount)) == NULL ) { + do_error(_("cannot malloc pointer to done vector\n")); + } +- bzero(prog_rpt_done, sizeof(__uint64_t)*glob_agcount); ++ memset(prog_rpt_done, 0, sizeof(__uint64_t)*glob_agcount); + + /* + * Setup comm block, start the thread +@@ -296,7 +296,7 @@ set_progress_msg (int report, __uint64_t + + /* reset all the accumulative totals */ + if (prog_rpt_done) +- bzero(prog_rpt_done, sizeof(__uint64_t)*glob_agcount); ++ memset(prog_rpt_done, 0, sizeof(__uint64_t)*glob_agcount); + + if (pthread_mutex_unlock(&global_msgs.mutex)) + do_error(_("set_progress_msg: cannot unlock progress mutex\n")); +@@ -321,7 +321,7 @@ print_final_rpt(void) + if (pthread_mutex_lock(&global_msgs.mutex)) + do_error(_("print_final_rpt: cannot lock progress mutex\n")); + +- bzero(&msgbuf, sizeof(msgbuf)); ++ memset(&msgbuf, 0, sizeof(msgbuf)); + + now = time (NULL); + tmp = localtime ((const time_t *) &now); -- cgit v1.2.3