[Pkg-lustre-svn-commit] updated: [ad70829] Fix configure on debian unstable, which is broken since a autofoo update

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit ad708293b2d7c235607edf5faff2b1c3e48cc60c
Author: Patrick Winnertz <winnie at debian.org>
Date:   Thu Mar 4 21:41:43 2010 +0100

    Fix configure on debian unstable, which is broken since a autofoo update
    
    Signed-off-by: Patrick Winnertz <winnie at debian.org>

diff --git a/debian/patches/00list b/debian/patches/00list
index 6a96baa..c818957 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -29,4 +29,5 @@ fix_various_typecasts.dpatch
 #build-fixes-for_2.6.18_servers.dpatch
 no-strict-aliasing.dpatch
 fix_bashisms_for_dash.dpatch
+configure_error_on_unstable.patch
 autogen-run.dpatch
diff --git a/debian/patches/configure_error_on_unstable.dpatch b/debian/patches/configure_error_on_unstable.dpatch
new file mode 100755
index 0000000..9c24703
--- /dev/null
+++ b/debian/patches/configure_error_on_unstable.dpatch
@@ -0,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## autogen.dpatch by Patrick Winnertz <winnie at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fix configure on debian unstable
+
+ at DPATCH@
+diff -u -p -r1.14 lustre-build-darwin.m4
+--- build/autoconf/lustre-build-darwin.m4	14 May 2009 15:23:33 -0000	1.14
++++ build/autoconf/lustre-build-darwin.m4	1 Nov 2009 22:19:54 -0000
+@@ -16,7 +16,7 @@ AS_IF([AC_TRY_COMMAND(nm /mach | grep "[
+ 	AC_DEFINE_UNQUOTED(AS_TR_CPP([HAVE_$ac_func])) $2
+ ],[
+ 	AC_MSG_RESULT([no]) $3
+-])dnl
++])
+ done
+ ])
+ 
+diff -u -p -r1.65 lustre-build-linux.m4
+--- build/autoconf/lustre-build-linux.m4	28 Jul 2009 12:41:53 -0000	1.65
++++ build/autoconf/lustre-build-linux.m4	1 Nov 2009 22:19:54 -0000
+@@ -343,7 +343,7 @@ rm -f build/conftest.o build/conftest.mo
+ AS_IF([AC_TRY_COMMAND(cp conftest.c build && make -d [$2] ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build) >/dev/null && AC_TRY_COMMAND([$3])],
+ 	[$4],
+ 	[_AC_MSG_LOG_CONFTEST
+-m4_ifvaln([$5],[$5])dnl])dnl
++m4_ifvaln([$5],[$5])dnl])
+ rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko m4_ifval([$1], [build/conftest.c conftest.c])[]dnl
+ ])
+ 

-- 
Lustre Debian Packaging