[Pkg-lustre-svn-commit] updated: [ea51149] Fix configure patch for debian unstable

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit ea51149f20baabe515f9eadcbb100f591ccb9a76
Author: Patrick Winnertz <winnie at debian.org>
Date:   Mon Mar 8 10:50:31 2010 +0100

    Fix configure patch for debian unstable
    
    Signed-off-by: Patrick Winnertz <winnie at debian.org>

diff --git a/debian/patches/configure_error_on_unstable.dpatch b/debian/patches/configure_error_on_unstable.dpatch
index 9c24703..3ef87fd 100755
--- a/debian/patches/configure_error_on_unstable.dpatch
+++ b/debian/patches/configure_error_on_unstable.dpatch
@@ -5,23 +5,23 @@
 ## DP: fix configure on debian unstable
 
 @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 -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lustre~/build/autoconf/lustre-build-linux.m4 lustre/build/autoconf/lustre-build-linux.m4
+--- lustre~/build/autoconf/lustre-build-linux.m4	2010-03-08 10:25:09.000000000 +0100
++++ lustre/build/autoconf/lustre-build-linux.m4	2010-03-08 11:00:46.106781669 +0100
+@@ -343,7 +343,7 @@
+ 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/' -e 's/i.86/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
  ])
  
-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])],
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lustre~/ldiskfs/build/autoconf/lustre-build-linux.m4 lustre/ldiskfs/build/autoconf/lustre-build-linux.m4
+--- lustre~/ldiskfs/build/autoconf/lustre-build-linux.m4	2010-03-08 10:25:09.000000000 +0100
++++ lustre/ldiskfs/build/autoconf/lustre-build-linux.m4	2010-03-08 11:01:09.629794696 +0100
+@@ -343,7 +343,7 @@
+ 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/' -e 's/i.86/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
diff --git a/debian/rules b/debian/rules
index 9de8d67..b055a15 100755
--- a/debian/rules
+++ b/debian/rules
@@ -52,7 +52,7 @@ autogen-stamp: patch-stamp
 	cp /usr/share/misc/config.guess config.guess
 	cp /usr/share/misc/config.guess libsysio/config.guess
 	cp /usr/share/misc/config.guess ldiskfs/config.guess
-	#sh ./autogen.sh
+	sh ./autogen.sh
 	touch $@
 
 configure: configure-stamp

-- 
Lustre Debian Packaging