The following commit has been merged in the master branch: commit 393900cdbfe88c1b3a2d591beab85967c1cea0c9 Author: Marco Nelles <marco.nel...@credativ.de> Date: Tue Jun 5 11:47:22 2012 +0200
Adapted no-strict-aliasing.patch diff --git a/debian/patches/no-strict-aliasing.patch b/debian/patches/no-strict-aliasing.patch index 427e96d..8c7e2f0 100644 --- a/debian/patches/no-strict-aliasing.patch +++ b/debian/patches/no-strict-aliasing.patch @@ -1,11 +1,11 @@ -## no_default_debugging.patch by Patrick Winnertz <win...@debian.org> +## no-strict-aliasing.patch by Patrick Winnertz <win...@debian.org> ## DP: Build lustre wit -fno-strict-aliasing as it otherwise fails to compile with gcc-4.4 Index: lustre/lustre/autoconf/lustre-core.m4 =================================================================== --- lustre.orig/lustre/autoconf/lustre-core.m4 2010-12-07 17:00:37.901545003 +0100 +++ lustre/lustre/autoconf/lustre-core.m4 2010-12-07 17:00:47.757545002 +0100 -@@ -2344,9 +2344,9 @@ +@@ -2670,9 +2670,9 @@ AC_DEFUN([LC_CONFIGURE], [LC_CONFIG_OBD_BUFFER_SIZE @@ -15,6 +15,6 @@ Index: lustre/lustre/autoconf/lustre-core.m4 +#if test $target_cpu == "i686" -o $target_cpu == "x86_64"; then +# CFLAGS="$CFLAGS -Werror" +#fi - - # include/liblustre.h - AC_CHECK_HEADERS([asm/page.h sys/user.h sys/vfs.h stdint.h blkid/blkid.h]) + + # maximum MDS thread count + LC_MDS_MAX_THREADS diff --git a/debian/patches/series b/debian/patches/series index 9b13eee..d8fa40d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -12,7 +12,7 @@ lustre-config.patch fix-symlink-attack.patch use-bash-instead-of-sh.patch fix-oot-builds.patch -#no-strict-aliasing.patch +no-strict-aliasing.patch fix-bashisms-for-dash.patch #fix_dentry_conf_test.patch #cacheflush_remove_mark_rodata.patch -- Lustre Debian Packaging _______________________________________________ Pkg-lustre-svn-commit mailing list Pkg-lustre-svn-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-lustre-svn-commit