The following commit has been merged in the master branch:
commit 7c9f50874c90ccb6bad1633a205204abe2cead2f
Author: Patrick Winnertz <win...@debian.org>
Date:   Wed Apr 21 11:08:00 2010 +0200

    Updated no-strict-aliasing patch and removed non-needed stuff
    
    Signed-off-by: Patrick Winnertz <win...@debian.org>

diff --git a/debian/patches/no-strict-aliasing.dpatch 
b/debian/patches/no-strict-aliasing.dpatch
index 4b88af0..bd62656 100755
--- a/debian/patches/no-strict-aliasing.dpatch
+++ b/debian/patches/no-strict-aliasing.dpatch
@@ -7,7 +7,7 @@
 @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-03-18 16:07:40.643923983 +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])
@@ -53,15 +53,19 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' 
'--exclude=.git' '--exclude=.arch'
  LB_LINUX_TRY_COMPILE([
        #include <linux/fs.h>
  ],[
-@@ -3246,7 +3246,7 @@
+@@ -3245,9 +3245,9 @@
+ AC_DEFUN([LC_CONFIGURE],
  [LC_CONFIG_OBD_BUFFER_SIZE
  
- if test $target_cpu == "i686" -o $target_cpu == "x86_64"; then
+-if test $target_cpu == "i686" -o $target_cpu == "x86_64"; then
 -        CFLAGS="$CFLAGS -Werror"
-+        CFLAGS="$CFLAGS -Werror -fno-strict-aliasing"
- fi
+-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])
@@ -134,120 +138,9 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' 
'--exclude=.git' '--exclude=.arch'
        # 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~/ldiskfs/aclocal.m4 lustre/ldiskfs/aclocal.m4
---- lustre~/ldiskfs/aclocal.m4 2010-03-11 13:05:55.000000000 +0100
-+++ lustre/ldiskfs/aclocal.m4  2010-03-18 16:07:40.643923983 +0100
-@@ -596,7 +596,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~/libsysio/aclocal.m4 lustre/libsysio/aclocal.m4
---- lustre~/libsysio/aclocal.m4        2010-03-11 13:05:55.000000000 +0100
-+++ lustre/libsysio/aclocal.m4 2010-03-18 16:07:40.643923983 +0100
-@@ -221,7 +221,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
--      # or remarks (even with -Werror).  So we grep stderr for any message
-+      # or remarks (even with -Werror -fno-strict-aliasing).  So we grep 
stderr for any message
-       # that says an option was ignored or not supported.
-       # When given -MP, icc 7.0 and 7.1 complain thusly:
-       #   icc: Command line warning: ignoring option '-M'; no argument 
required
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
lustre~/libsysio/configure.in lustre/libsysio/configure.in
---- lustre~/libsysio/configure.in      2010-03-11 13:05:55.000000000 +0100
-+++ lustre/libsysio/configure.in       2010-03-18 16:07:40.643923983 +0100
-@@ -362,7 +362,7 @@
- 
- AC_MSG_CHECKING(for POSIX 2008 preadv)
- tmp_flags="$CFLAGS"
--CFLAGS="$CFLAGS -Wall -Werror"
-+CFLAGS="$CFLAGS -Wall -Werror -fno-strict-aliasing"
- AC_TRY_COMPILE([
- #include <sys/uio.h>
- ssize_t preadv (int __fd, const struct iovec *__iovec,
-@@ -381,7 +381,7 @@
- 
- AC_MSG_CHECKING(for POSIX 2008 scandir)
- tmp_flags="$CFLAGS"
--CFLAGS="$CFLAGS -Wall -Werror"
-+CFLAGS="$CFLAGS -Wall -Werror -fno-strict-aliasing"
- AC_TRY_COMPILE([
- #define _BSD_SOURCE
- 
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
lustre~/lnet/autoconf/lustre-lnet.m4 lustre/lnet/autoconf/lustre-lnet.m4
---- lustre~/lnet/autoconf/lustre-lnet.m4       2010-03-11 13:05:55.000000000 
+0100
-+++ lustre/lnet/autoconf/lustre-lnet.m4        2010-03-18 16:07:40.643923983 
+0100
-@@ -1073,7 +1073,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>
-@@ -1096,7 +1096,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>
-@@ -1121,7 +1121,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>
-@@ -1145,7 +1145,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>
-@@ -1292,7 +1292,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;
-@@ -1336,7 +1336,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;
-@@ -1490,7 +1490,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>
 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-03-18 16:07:40.306949034 
+0100
-+++ lustre/lustre/autoconf/lustre-core.m4      2010-03-18 16:08:16.999988662 
+0100
+--- 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])
@@ -307,8 +200,8 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' 
'--exclude=.git' '--exclude=.arch'
  # 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-03-18 16:07:40.254924124 +0100
-+++ lustre/lustre/llite/file.c 2010-03-18 16:07:40.651923533 +0100
+--- 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);
@@ -365,7 +258,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' 
'--exclude=.git' '--exclude=.arch'
          /* 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-03-18 16:07:40.651923533 +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), "
@@ -379,7 +272,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' 
'--exclude=.git' '--exclude=.arch'
          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-03-18 16:07:40.655924251 +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;
  
@@ -389,29 +282,9 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' 
'--exclude=.git' '--exclude=.arch'
                  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/handler.c lustre/lustre/mds/handler.c
---- lustre~/lustre/mds/handler.c       2010-03-18 16:07:40.206923818 +0100
-+++ lustre/lustre/mds/handler.c        2010-03-18 16:07:40.655924251 +0100
-@@ -1240,14 +1240,14 @@
-         /* body->size is actually the offset -eeb */
-         if ((body->size & (blksize - 1)) != 0) {
-                 CERROR("offset "LPU64" not on a block boundary of %lu\n",
--                       body->size, blksize);
-+                       body->size, (long unsigned int)blksize);
-                 GOTO(out_file, rc = -EFAULT);
-         }
- 
-         /* body->nlink is actually the #bytes to read -eeb */
-         if (body->nlink & (blksize - 1)) {
-                 CERROR("size %u is not multiple of blocksize %lu\n",
--                       body->nlink, blksize);
-+                       body->nlink, (long unsigned int)blksize);
-                 GOTO(out_file, rc = -EFAULT);
-         }
- 
 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-03-18 16:07:40.655924251 +0100
++++ lustre/lustre/mds/mds_join.c       2010-04-21 11:03:05.157194090 +0200
 @@ -241,7 +241,7 @@
          int max_easize = sizeof(*lmmj);
  
@@ -423,7 +296,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' 
'--exclude=.git' '--exclude=.arch'
              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-03-18 16:07:40.659923781 +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)) {

-- 
Lustre Debian Packaging 

_______________________________________________
Pkg-lustre-svn-commit mailing list
Pkg-lustre-svn-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-lustre-svn-commit

Reply via email to