The following commit has been merged in the master branch: commit 9e7873940aea8bfa08893019575cbf24ece7400b Author: Patrick Winnertz <win...@debian.org> Date: Tue Aug 11 18:51:05 2009 +0200
Fix wrong includepath in libcfs (lnet/include was forgotten) Signed-off-by: Patrick Winnertz <win...@debian.org> diff --git a/debian/patches/00list b/debian/patches/00list index b23a48a..980f28a 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -21,4 +21,6 @@ fix-lustre-manpage.dpatch enable-quota.dpatch fix-symlink-attack.dpatch use_bash_instead_of_sh.dpatch +#hotfixes for 1.8.1: lustre-snmp-missing-include.dpatch +libcfs_wrong_includepath.dpatch diff --git a/debian/patches/libcfs_wrong_includepath.dpatch b/debian/patches/libcfs_wrong_includepath.dpatch new file mode 100755 index 0000000..0b5fb04 --- /dev/null +++ b/debian/patches/libcfs_wrong_includepath.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## autogen.dpatch by Patrick Winnertz <win...@debian.org> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: forgot include dir in gcc flags + +...@dpatch@ +diff -urNad lustre~/build/autoconf/lustre-build.m4 lustre/build/autoconf/lustre-build.m4 +--- lustre~/build/autoconf/lustre-build.m4 2009-08-12 10:52:19.000000000 +0200 ++++ lustre/build/autoconf/lustre-build.m4 2009-08-12 11:18:12.000000000 +0200 +@@ -764,7 +764,7 @@ + CC="$CC -m64" + fi + +-CPPFLAGS="-I$PWD/$LIBCFS_INCLUDE_DIR -I$PWD/lnet/include -I$PWD/lustre/include $CPPFLAGS" ++CPPFLAGS="-I$PWD/$LIBCFS_INCLUDE_DIR -I$TOP_DIR/lnet/include -I$TOP_DIR/lustre/include -I$PWD/lnet/include -I$PWD/lustre/include $CPPFLAGS" + + LLCPPFLAGS="-D__arch_lib__ -D_LARGEFILE64_SOURCE=1" + AC_SUBST(LLCPPFLAGS) diff --git a/debian/rules b/debian/rules index 0f612df..7d05555 100755 --- a/debian/rules +++ b/debian/rules @@ -65,7 +65,7 @@ configure-stamp: autogen-stamp debian/control cp lustre/contrib/mpich-*.patch $(BUILDDIR)/lustre/contrib/ ln -s ../../../libsysio/include $(BUILDDIR)/libsysio/ ( cd $(BUILDDIR) && \ - ../../configure --disable-dependency-tracking \ + export TOP_DIR=$(TOP_DIR); ../../configure --disable-dependency-tracking \ --disable-modules \ --enable-snmp \ --disable-client \ -- 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