[Pkg-lustre-svn-commit] r433 - in /trunk/debian: patches/autogen.sh.dpatch patches/libsysio.dpatch rules
goswin-guest at users.alioth.debian.org
goswin-guest at users.alioth.debian.org
Wed Feb 13 10:35:02 UTC 2008
Author: goswin-guest
Date: Wed Feb 13 10:35:02 2008
New Revision: 433
URL: http://svn.debian.org/wsvn/pkg-lustre/?sc=1&rev=433
Log:
Run autogen for libsysio too.
Remove generated files in clean.
Use config.sub/guess from autotools-dev.
Don't patch generated file in libsysio.dpatch.
Modified:
trunk/debian/patches/autogen.sh.dpatch
trunk/debian/patches/libsysio.dpatch
trunk/debian/rules
Modified: trunk/debian/patches/autogen.sh.dpatch
URL: http://svn.debian.org/wsvn/pkg-lustre/trunk/debian/patches/autogen.sh.dpatch?rev=433&op=diff
==============================================================================
--- trunk/debian/patches/autogen.sh.dpatch (original)
+++ trunk/debian/patches/autogen.sh.dpatch Wed Feb 13 10:35:02 2008
@@ -5,10 +5,10 @@
## DP: autogen.sh script from lustre upstream
@DPATCH@
-diff -urNad lustre-1.6.2~/autogen.sh lustre-1.6.2/autogen.sh
---- lustre-1.6.2~/autogen.sh 1970-01-01 01:00:00.000000000 +0100
-+++ lustre-1.6.2/autogen.sh 2007-09-06 14:17:31.856256909 +0200
-@@ -0,0 +1,128 @@
+diff -urNad lustre-1.6.4.2~/autogen.sh lustre-1.6.4.2/autogen.sh
+--- lustre-1.6.4.2~/autogen.sh 1970-01-01 01:00:00.000000000 +0100
++++ lustre-1.6.4.2/autogen.sh 2008-02-13 11:21:09.670947511 +0100
+@@ -0,0 +1,140 @@
+#!/bin/bash
+
+# taken from gnome-common/macros2/autogen.sh
@@ -137,3 +137,147 @@
+# sh autogen.sh
+# popd >/dev/null
+#fi
++
++pushd libsysio >/dev/null
++echo "Running libsysio aclocal-1.7 $ACLOCAL_FLAGS..."
++aclocal-1.7 $ACLOCAL_FLAGS
++echo "Running libsysio autoheader..."
++autoheader
++echo "Running libsysio automake-1.7..."
++automake-1.7 -a -c
++echo "Running libsysio autoconf..."
++autoconf
++popd >/dev/null
++
+diff -urNad lustre-1.6.4.2~/autogen.sh~ lustre-1.6.4.2/autogen.sh~
+--- lustre-1.6.4.2~/autogen.sh~ 1970-01-01 01:00:00.000000000 +0100
++++ lustre-1.6.4.2/autogen.sh~ 2008-02-13 11:20:25.000000000 +0100
+@@ -0,0 +1,128 @@
++#!/bin/bash
++
++# taken from gnome-common/macros2/autogen.sh
++compare_versions() {
++ ch_min_version=$1
++ ch_actual_version=$2
++ ch_status=0
++ IFS="${IFS= }"; ch_save_IFS="$IFS"; IFS="."
++ set $ch_actual_version
++ for ch_min in $ch_min_version; do
++ ch_cur=`echo $1 | sed 's/[^0-9].*$//'`; shift # remove letter suffixes
++ if [ -z "$ch_min" ]; then break; fi
++ if [ -z "$ch_cur" ]; then ch_status=1; break; fi
++ if [ $ch_cur -gt $ch_min ]; then break; fi
++ if [ $ch_cur -lt $ch_min ]; then ch_status=1; break; fi
++ done
++ IFS="$ch_save_IFS"
++ return $ch_status
++}
++
++error_msg() {
++ echo "$cmd is $1. version $required is required to build Lustre."
++
++ if [ -e /usr/lib/autolustre/bin/$cmd ]; then
++ cat >&2 <<-EOF
++ You apparently already have Lustre-specific autoconf/make RPMs
++ installed on your system at /usr/lib/autolustre/share/$cmd.
++ Please set your PATH to point to those versions:
++
++ export PATH="/usr/lib/autolustre/bin:\$PATH"
++ EOF
++ else
++ cat >&2 <<-EOF
++ CFS provides RPMs which can be installed alongside your
++ existing autoconf/make RPMs, if you are nervous about
++ upgrading. See
++
++ ftp://ftp.lustre.org/pub/other/autolustre/README.autolustre
++
++ You may be able to download newer version from:
++
++ http://ftp.gnu.org/gnu/$tool/$tool-$required.tar.gz
++ EOF
++ fi
++ [ "$cmd" = "autoconf" -a "$required" = "2.57" ] && cat >&2 <<EOF
++
++or for RH9 systems you can use:
++
++ftp://fr2.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/autoconf-2.57-3.noarch.rpm
++EOF
++ [ "$cmd" = "automake-1.7" -a "$required" = "1.7.8" ] && cat >&2 <<EOF
++
++or for RH9 systems you can use:
++
++ftp://fr2.rpmfind.net/linux/fedora/core/1/i386/os/Fedora/RPMS/automake-1.7.8-1.noarch.rpm
++EOF
++ exit 1
++}
++
++check_version() {
++ local tool
++ local cmd
++ local required
++ local version
++
++ tool=$1
++ cmd=$2
++ required=$3
++ echo -n "checking for $cmd $required... "
++ if ! $cmd --version >/dev/null ; then
++ error_msg "missing"
++ fi
++ version=$($cmd --version | awk "/$tool \(GNU/ { print \$4 }")
++ echo "found $version"
++ if ! compare_versions "$required" "$version" ; then
++ error_msg "too old"
++ fi
++}
++
++echo "Checking for a complete tree..."
++# required directories
++for dir in build lnet lustre ; do
++ if [ ! -d "$dir" ] ; then
++ pwd
++ cat >&2 <<EOF
++Your tree seems to be missing $dir.
++Please read README.lustrecvs for details.
++EOF
++ exit 1
++ fi
++ ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I $PWD/$dir/autoconf"
++done
++# some are optional
++for dir in snmp portals; do
++ if [ -d "$dir" ] ; then
++ ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I $PWD/$dir/autoconf"
++ fi
++done
++
++check_version automake automake-1.7 "1.7.8"
++check_version autoconf autoconf "2.57"
++
++echo "Running aclocal-1.7 $ACLOCAL_FLAGS..."
++aclocal-1.7 $ACLOCAL_FLAGS
++echo "Running autoheader..."
++autoheader
++echo "Running automake-1.7..."
++automake-1.7 -a -c
++echo "Running autoconf..."
++autoconf
++
++pushd ldiskfs >/dev/null
++echo "Running ldiskfs aclocal-1.7 $ACLOCAL_FLAGS..."
++aclocal-1.7 $ACLOCAL_FLAGS
++echo "Running ldiskfs autoheader..."
++autoheader
++echo "Running ldiskfs automake-1.7..."
++automake-1.7 -a -c
++echo "Running ldiskfs autoconf..."
++autoconf
++popd >/dev/null
++
++if [ -d libsysio ] ; then
++ pushd libsysio >/dev/null
++ echo "Running autogen for libsysio..."
++ sh autogen.sh
++ popd >/dev/null
++fi
Modified: trunk/debian/patches/libsysio.dpatch
URL: http://svn.debian.org/wsvn/pkg-lustre/trunk/debian/patches/libsysio.dpatch?rev=433&op=diff
==============================================================================
--- trunk/debian/patches/libsysio.dpatch (original)
+++ trunk/debian/patches/libsysio.dpatch Wed Feb 13 10:35:02 2008
@@ -16,14 +16,3 @@
$(LLCPPFLAGS) -I$(top_srcdir)/lnet/ulnds
AM_CFLAGS = $(LLCFLAGS)
---- lustre-1.6.0.1/lustre/liblustre/Makefile.in~ 2004-12-20 00:06:24.000000000 +0100
-+++ lustre-1.6.0.1/lustre/liblustre/Makefile.in 2007-07-20 12:35:54.000000000 +0200
-@@ -269,7 +269,7 @@
- target_vendor = @target_vendor@
- SUBDIRS = . tests
-
--AM_CPPFLAGS = $(HAVE_EFENCE) -I$(SYSIO)/include -D_LARGEFILE64_SOURCE=1 \
-+AM_CPPFLAGS = $(HAVE_EFENCE) -I$(top_srcdir)/libsysio/include -D_LARGEFILE64_SOURCE=1 \
- $(LLCPPFLAGS) -I$(top_srcdir)/lnet/ulnds
-
- AM_CFLAGS = $(LLCFLAGS)
Modified: trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-lustre/trunk/debian/rules?rev=433&op=diff
==============================================================================
--- trunk/debian/rules (original)
+++ trunk/debian/rules Wed Feb 13 10:35:02 2008
@@ -44,6 +44,12 @@
autogen: autogen-stamp
autogen-stamp: patch-stamp
+ cp /usr/share/misc/config.sub config.sub
+ cp /usr/share/misc/config.sub libsysio/config.sub
+ cp /usr/share/misc/config.sub ldiskfs/config.sub
+ 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
touch $@
@@ -284,6 +290,13 @@
rm -rf debian/substvars debian/*.bak debian/*~ *~ *-stamp
rm -rf $(BUILDDIR)
rm -rf debian/patched
+ rm -f aclocal.m4 autoMakefile.in config.h.in configure
+ rm -f ldiskfs/aclocal.m4 ldiskfs/autoMakefile.in
+ rm -f ldiskfs/config.h.in ldiskfs/configure
+ find -name "autoMakefile.in" -exec rm -f -- "{}" \;
+ find -name "Makefile.in" | while read IN; do AM="$$(dirname "$$IN")/$$(basename "$$IN" .in).am"; if [ -e "$$AM" ]; then rm "$$IN"; fi; done
+ rm -rf config.sub libsysio/config.sub ldiskfs/config.sub
+ rm -rf config.guess libsysio/config.guess ldiskfs/config.guess
dh_clean
patch: patch-stamp
More information about the Pkg-lustre-svn-commit
mailing list