[Pkg-lustre-svn-commit] updated: [72e426e] Remove -Werror from gcc arguments
Patrick Winnertz
winnie at debian.org
Fri Aug 6 10:40:28 UTC 2010
The following commit has been merged in the master branch:
commit 72e426e2b40dbb698cf1c4e5b8d7dcd374c7d751
Author: Patrick Winnertz <winnie at debian.org>
Date: Wed Aug 4 12:58:02 2010 +0200
Remove -Werror from gcc arguments
Signed-off-by: Patrick Winnertz <winnie at debian.org>
diff --git a/debian/patches/00list b/debian/patches/00list
index 441370f..732386e 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -24,6 +24,6 @@ fix_version_tag-pl.dpatch
#hotfixes for 1.8.2:
fix-oot-builds.dpatch
#fix_various_typecasts.dpatch
-#no-strict-aliasing.dpatch
+no-strict-aliasing.dpatch
fix_bashisms_for_dash.dpatch
fix_dentry_conf_test.dpatch
diff --git a/debian/patches/no-strict-aliasing.dpatch b/debian/patches/no-strict-aliasing.dpatch
index bd62656..e82103c 100755
--- a/debian/patches/no-strict-aliasing.dpatch
+++ b/debian/patches/no-strict-aliasing.dpatch
@@ -5,188 +5,10 @@
## DP: Build lustre wit -fno-strict-aliasing as it otherwise fails to compile with gcc-4.4
@DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lustre~/aclocal.m4 lustre/aclocal.m4
---- lustre~/aclocal.m4 2010-03-11 13:05:55.000000000 +0100
-+++ lustre/aclocal.m4 2010-04-21 11:07:29.552195225 +0200
-@@ -1681,7 +1681,7 @@
- AC_DEFUN([LC_UMOUNTBEGIN_HAS_VFSMOUNT],
- [AC_MSG_CHECKING([if umount_begin needs vfsmount parameter instead of super_block])
- tmp_flags="$EXTRA_KCFLAGS"
--EXTRA_KCFLAGS="-Werror"
-+EXTRA_KCFLAGS="-Werror -fno-strict-aliasing"
- LB_LINUX_TRY_COMPILE([
- #include <linux/fs.h>
-
-@@ -1746,7 +1746,7 @@
- AC_DEFUN([LC_VFS_READDIR_U64_INO],
- [AC_MSG_CHECKING([check vfs_readdir need 64bit inode number])
- tmp_flags="$EXTRA_KCFLAGS"
--EXTRA_KCFLAGS="-Werror"
-+EXTRA_KCFLAGS="-Werror -fno-strict-aliasing"
- LB_LINUX_TRY_COMPILE([
- #include <linux/fs.h>
- int fillonedir(void * __buf, const char * name, int namlen, loff_t offset,
-@@ -2086,7 +2086,7 @@
- AC_DEFUN([LC_RW_TREE_LOCK],
- [AC_MSG_CHECKING([if kernel has tree_lock as rwlock])
- tmp_flags="$EXTRA_KCFLAGS"
--EXTRA_KCFLAGS="-Werror"
-+EXTRA_KCFLAGS="-Werror -fno-strict-aliasing"
- LB_LINUX_TRY_COMPILE([
- #include <linux/fs.h>
- ],[
-@@ -2214,7 +2214,7 @@
- ],[
- AC_MSG_CHECKING([if kernel using gfp_t for shrinker second paramter])
- tmp_flags="$EXTRA_KCFLAGS"
-- EXTRA_KCFLAGS="-Werror"
-+ EXTRA_KCFLAGS="-Werror -fno-strict-aliasing"
- LB_LINUX_TRY_COMPILE([
- #include <linux/mm.h>
- ],[
-@@ -2454,7 +2454,7 @@
- AC_DEFUN([LC_RW_TREE_LOCK],
- [AC_MSG_CHECKING([mapping->tree_lock is rw_lock])
- tmp_flags="$EXTRA_KCFLAGS"
--EXTRA_KCFLAGS="-Werror"
-+EXTRA_KCFLAGS="-Werror -fno-strict-aliasing"
- LB_LINUX_TRY_COMPILE([
- #include <linux/fs.h>
- ],[
-@@ -3245,9 +3245,9 @@
- AC_DEFUN([LC_CONFIGURE],
- [LC_CONFIG_OBD_BUFFER_SIZE
-
--if test $target_cpu == "i686" -o $target_cpu == "x86_64"; then
-- CFLAGS="$CFLAGS -Werror"
--fi
-+#if test $target_cpu == "i686" -o $target_cpu == "x86_64"; then
-+# CFLAGS="$CFLAGS -Werror -fno-strict-aliasing"
-+#fi
-
- # include/liblustre.h
- AC_CHECK_HEADERS([asm/page.h sys/user.h sys/vfs.h stdint.h blkid/blkid.h])
-@@ -5093,7 +5093,7 @@
- AC_DEFUN([LN_KERN__U64_LONG_LONG],
- [AC_MSG_CHECKING([kernel __u64 is long long type])
- tmp_flags="$EXTRA_KCFLAGS"
--EXTRA_KCFLAGS="$EXTRA_KCFLAGS -Werror"
-+EXTRA_KCFLAGS="$EXTRA_KCFLAGS -Werror -fno-strict-aliasing"
- LB_LINUX_TRY_COMPILE([
- #include <linux/types.h>
- #include <linux/stddef.h>
-@@ -5116,7 +5116,7 @@
- AC_DEFUN([LN_USER__U64_LONG_LONG],
- [AC_MSG_CHECKING([userspace __u64 is long long type])
- tmp_flags="$CFLAGS"
--CFLAGS="$CFLAGS -Werror"
-+CFLAGS="$CFLAGS -Werror -fno-strict-aliasing"
- AC_COMPILE_IFELSE([
- #include <linux/types.h>
- #include <linux/stddef.h>
-@@ -5141,7 +5141,7 @@
- AC_DEFUN([LN_SIZE_T_LONG],
- [AC_MSG_CHECKING([size_t is unsigned long type])
- tmp_flags="$CFLAGS"
--CFLAGS="$CFLAGS -Werror"
-+CFLAGS="$CFLAGS -Werror -fno-strict-aliasing"
- AC_COMPILE_IFELSE([
- #include <linux/types.h>
- #include <linux/stddef.h>
-@@ -5165,7 +5165,7 @@
- AC_DEFUN([LN_SSIZE_T_LONG],
- [AC_MSG_CHECKING([ssize_t is signed long type])
- tmp_flags="$CFLAGS"
--CFLAGS="$CFLAGS -Werror"
-+CFLAGS="$CFLAGS -Werror -fno-strict-aliasing"
- AC_COMPILE_IFELSE([
- #include <linux/types.h>
- #include <linux/stddef.h>
-@@ -5312,7 +5312,7 @@
- AC_DEFUN([LN_KMEM_CACHE],
- [AC_MSG_CHECKING([check kernel has struct kmem_cache])
- tmp_flags="$EXTRA_KCFLAGS"
--EXTRA_KCFLAGS="-Werror"
-+EXTRA_KCFLAGS="-Werror -fno-strict-aliasing"
- LB_LINUX_TRY_COMPILE([
- #include <linux/slab.h>
- typedef struct kmem_cache cache_t;
-@@ -5356,7 +5356,7 @@
- [LB_CHECK_SYMBOL_EXPORT([dump_trace],
- [kernel/ksyms.c arch/${LINUX_ARCH%_64}/kernel/traps_64.c],[
- tmp_flags="$EXTRA_KCFLAGS"
-- EXTRA_KCFLAGS="-Werror"
-+ EXTRA_KCFLAGS="-Werror -fno-strict-aliasing"
- AC_MSG_CHECKING([whether we can really use dump_trace])
- LB_LINUX_TRY_COMPILE([
- struct task_struct;
-@@ -5510,7 +5510,7 @@
- AC_DEFUN([LN_FUNC_UNSHARE_FS_STRUCT],
- [AC_MSG_CHECKING([if kernel defines unshare_fs_struct()])
- tmp_flags="$EXTRA_KCFLAGS"
--EXTRA_KCFLAGS="-Werror"
-+EXTRA_KCFLAGS="-Werror -fno-strict-aliasing"
- LB_LINUX_TRY_COMPILE([
- #include <linux/sched.h>
- #include <linux/fs_struct.h>
-@@ -6705,7 +6705,7 @@
- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
- # icc doesn't choke on unknown options, it will just issue warnings
-- # (even with -Werror). So we grep stderr for any message
-+ # (even with -Werror -fno-strict-aliasing). So we grep stderr for any message
- # that says an option was ignored.
- if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
- am_cv_$1_dependencies_compiler_type=$depmode
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lustre~/lustre/autoconf/lustre-core.m4 lustre/lustre/autoconf/lustre-core.m4
---- lustre~/lustre/autoconf/lustre-core.m4 2010-04-21 11:03:04.964193828 +0200
-+++ lustre/lustre/autoconf/lustre-core.m4 2010-04-21 11:03:05.153194299 +0200
-@@ -651,7 +651,7 @@
- AC_DEFUN([LC_UMOUNTBEGIN_HAS_VFSMOUNT],
- [AC_MSG_CHECKING([if umount_begin needs vfsmount parameter instead of super_block])
- tmp_flags="$EXTRA_KCFLAGS"
--EXTRA_KCFLAGS="-Werror"
-+EXTRA_KCFLAGS="Werror -fno-strict-aliasing"
- LB_LINUX_TRY_COMPILE([
- #include <linux/fs.h>
-
-@@ -716,7 +716,7 @@
- AC_DEFUN([LC_VFS_READDIR_U64_INO],
- [AC_MSG_CHECKING([check vfs_readdir need 64bit inode number])
- tmp_flags="$EXTRA_KCFLAGS"
--EXTRA_KCFLAGS="-Werror"
-+EXTRA_KCFLAGS="-Werror -fno-strict-aliasing"
- LB_LINUX_TRY_COMPILE([
- #include <linux/fs.h>
- int fillonedir(void * __buf, const char * name, int namlen, loff_t offset,
-@@ -1056,7 +1056,7 @@
- AC_DEFUN([LC_RW_TREE_LOCK],
- [AC_MSG_CHECKING([if kernel has tree_lock as rwlock])
- tmp_flags="$EXTRA_KCFLAGS"
--EXTRA_KCFLAGS="-Werror"
-+EXTRA_KCFLAGS="-Werror -fno-strict-aliasing"
- LB_LINUX_TRY_COMPILE([
- #include <linux/fs.h>
- ],[
-@@ -1184,7 +1184,7 @@
- ],[
- AC_MSG_CHECKING([if kernel using gfp_t for shrinker second paramter])
- tmp_flags="$EXTRA_KCFLAGS"
-- EXTRA_KCFLAGS="-Werror"
-+ EXTRA_KCFLAGS="-Werror -fno-strict-aliasing"
- LB_LINUX_TRY_COMPILE([
- #include <linux/mm.h>
- ],[
-@@ -1424,7 +1424,7 @@
- AC_DEFUN([LC_RW_TREE_LOCK],
- [AC_MSG_CHECKING([mapping->tree_lock is rw_lock])
- tmp_flags="$EXTRA_KCFLAGS"
--EXTRA_KCFLAGS="-Werror"
-+EXTRA_KCFLAGS="-Werror -fno-strict-aliasing"
- LB_LINUX_TRY_COMPILE([
- #include <linux/fs.h>
- ],[
-@@ -2216,9 +2216,9 @@
+--- lustre~/lustre/autoconf/lustre-core.m4 2010-08-04 12:56:24.000000000 +0200
++++ lustre/lustre/autoconf/lustre-core.m4 2010-08-04 12:57:31.810494143 +0200
+@@ -2269,9 +2269,9 @@
AC_DEFUN([LC_CONFIGURE],
[LC_CONFIG_OBD_BUFFER_SIZE
@@ -194,115 +16,8 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
- CFLAGS="$CFLAGS -Werror"
-fi
+#if test $target_cpu == "i686" -o $target_cpu == "x86_64"; then
-+# CFLAGS="$CFLAGS -Werror -fno-strict-aliasing"
++# CFLAGS="$CFLAGS -Werror"
+#fi
# include/liblustre.h
AC_CHECK_HEADERS([asm/page.h sys/user.h sys/vfs.h stdint.h blkid/blkid.h])
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lustre~/lustre/llite/file.c lustre/lustre/llite/file.c
---- lustre~/lustre/llite/file.c 2010-04-21 11:03:04.916194526 +0200
-+++ lustre/lustre/llite/file.c 2010-04-21 11:03:05.157194090 +0200
-@@ -1428,7 +1428,7 @@
-
- count = ll_file_get_iov_count(iov, &nr_segs);
- CDEBUG(D_VFSTRACE, "VFS Op:inode=%lu/%u(%p),size="LPSZ",offset=%Ld\n",
-- inode->i_ino, inode->i_generation, inode, count, *ppos);
-+ inode->i_ino, inode->i_generation, inode, (unsigned int)count, *ppos);
- /* "If nbyte is 0, read() will return 0 and have no other results."
- * -- Single Unix Spec */
- if (count == 0)
-@@ -1598,7 +1598,7 @@
-
- chunk = end - *ppos + 1;
- CDEBUG(D_INODE,"Read ino %lu, "LPSZ" bytes, offset %lld, i_size %llu\n",
-- inode->i_ino, chunk, *ppos, i_size_read(inode));
-+ inode->i_ino, (unsigned int)chunk, *ppos, i_size_read(inode));
-
- /* turn off the kernel's read-ahead */
- if (ltd.lock_style != LL_LOCK_STYLE_NOLOCK) {
-@@ -1778,7 +1778,7 @@
- count = ll_file_get_iov_count(iov, &nr_segs);
-
- CDEBUG(D_VFSTRACE, "VFS Op:inode=%lu/%u(%p),size="LPSZ",offset=%Ld\n",
-- inode->i_ino, inode->i_generation, inode, count, *ppos);
-+ inode->i_ino, inode->i_generation, inode, (unsigned int)count, *ppos);
-
- SIGNAL_MASK_ASSERT(); /* XXX BUG 1511 */
-
-@@ -1881,7 +1881,7 @@
- /* generic_file_write handles O_APPEND after getting i_mutex */
- chunk = end - *ppos + 1;
- CDEBUG(D_INFO, "Writing inode %lu, "LPSZ" bytes, offset %Lu\n",
-- inode->i_ino, chunk, *ppos);
-+ inode->i_ino, (unsigned int)chunk, *ppos);
- if (tree_locked) {
- struct ost_lvb *xtimes;
- /* write under locks
-@@ -2116,7 +2116,7 @@
- ENTRY;
-
- CDEBUG(D_VFSTRACE, "VFS Op:inode=%lu/%u(%p),size="LPSZ",offset=%Ld\n",
-- inode->i_ino, inode->i_generation, inode, count, *ppos);
-+ inode->i_ino, inode->i_generation, inode, (unsigned int)count, *ppos);
-
- /* "If nbyte is 0, read() will return 0 and have no other results."
- * -- Single Unix Spec */
-@@ -2181,7 +2181,7 @@
- }
-
- CDEBUG(D_INFO, "Send ino %lu, "LPSZ" bytes, offset %lld, i_size %llu\n",
-- inode->i_ino, count, *ppos, i_size_read(inode));
-+ inode->i_ino, (unsigned int)count, *ppos, i_size_read(inode));
-
- ll_ra_read_init(in_file, &bead, *ppos, count);
- /* BUG: 5972 */
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lustre~/lustre/llite/rw26.c lustre/lustre/llite/rw26.c
---- lustre~/lustre/llite/rw26.c 2010-03-11 13:05:55.000000000 +0100
-+++ lustre/lustre/llite/rw26.c 2010-04-21 11:03:05.157194090 +0200
-@@ -242,8 +242,8 @@
-
- CDEBUG(D_VFSTRACE, "VFS Op:inode=%lu/%u(%p), size="LPSZ" (max %lu), "
- "offset=%lld=%llx, pages "LPSZ" (max %lu)\n",
-- inode->i_ino, inode->i_generation, inode, count, MAX_DIO_SIZE,
-- file_offset, file_offset, count >> CFS_PAGE_SHIFT,
-+ inode->i_ino, inode->i_generation, inode, (unsigned int)count, MAX_DIO_SIZE,
-+ file_offset, file_offset, (unsigned int)count >> CFS_PAGE_SHIFT,
- MAX_DIO_SIZE >> CFS_PAGE_SHIFT);
-
- if (rw == WRITE)
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lustre~/lustre/lvfs/fsfilt_ext3.c lustre/lustre/lvfs/fsfilt_ext3.c
---- lustre~/lustre/lvfs/fsfilt_ext3.c 2010-03-03 14:44:38.000000000 +0100
-+++ lustre/lustre/lvfs/fsfilt_ext3.c 2010-04-21 11:03:05.157194090 +0200
-@@ -721,7 +721,7 @@
- const int blksize = inode->i_sb->s_blocksize;
-
- CDEBUG(D_EXT2, "reading "LPSZ" at dir %lu+%llu\n",
-- count, inode->i_ino, *off);
-+ (unsigned int)count, inode->i_ino, *off);
- while (count > 0) {
- struct buffer_head *bh;
-
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lustre~/lustre/mds/mds_join.c lustre/lustre/mds/mds_join.c
---- lustre~/lustre/mds/mds_join.c 2010-01-23 03:07:58.000000000 +0100
-+++ lustre/lustre/mds/mds_join.c 2010-04-21 11:03:05.157194090 +0200
-@@ -241,7 +241,7 @@
- int max_easize = sizeof(*lmmj);
-
- CDEBUG(D_INFO, "change the max md size from %d to "LPSZ"\n",
-- mds->mds_max_mdsize, sizeof(*lmmj));
-+ mds->mds_max_mdsize, (unsigned int)sizeof(*lmmj));
-
- if (mds->mds_max_mdsize < max_easize ||
- mds->mds_max_cookiesize < max_cookiesize) {
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lustre~/lustre/obdclass/obd_mount.c lustre/lustre/obdclass/obd_mount.c
---- lustre~/lustre/obdclass/obd_mount.c 2010-03-11 13:05:55.000000000 +0100
-+++ lustre/lustre/obdclass/obd_mount.c 2010-04-21 11:03:05.157194090 +0200
-@@ -279,7 +279,7 @@
- CDEBUG(D_MOUNT, "Have %s, size %lu\n", MOUNT_DATA_FILE, len);
- if (len != sizeof(*ldd)) {
- CERROR("disk data size does not match: see %lu expect "LPSZ"\n",
-- len, sizeof(*ldd));
-+ (long unsigned int)len, (unsigned int)sizeof(*ldd));
- GOTO(out_close, rc = -EINVAL);
- }
-
--
Lustre Debian Packaging
More information about the Pkg-lustre-svn-commit
mailing list