On Wed, Jun 11, 2008 at 02:51:44PM -0700, Bernard Li wrote:
>
> Doesn't look it applies cleanly to the 3.1.x branch:
>
> # patch -p0 --dry-run < ganglia-3.1-bootstrap-noauto.patch
> patching file libmetrics/bootstrap
> patching file bootstrap
> Hunk #1 FAILED at 1.
> 1 out of 2 hunks FAILED -- saving rejects to file bootstrap.rej
the patch was generated using svn from a patched 3.1 branch, but `patch` won't
be able to identify and correct the conflict generated by the expansion of
"$Id: $", and so that patch won't apply cleanly using it as you reported.
my bad, wasn't expecting it to be used that way but if you want to use patch
to apply it to your branch from this email then use the attached file instead
(will need -p1).
for a snapshot that was generated in CentOS 4.6 using this patched ganglia-3.1
branch and that is otherwise equivalent to the one you published (except that
it will work in DragonFlyBSD) go to :
http://tapir.sajinet.com.pe/ganglia/ganglia-3.1.0.1399.tar.gz
Carlo
diff -urp ganglia-3.1/bootstrap ganglia-3.1/bootstrap
--- ganglia-3.1/bootstrap 2008-04-18 18:13:41.000000000 -0700
+++ ganglia-3.1/bootstrap 2008-06-11 16:04:51.000000000 -0700
@@ -1,14 +1,5 @@
#!/bin/sh
# $Id: bootstrap 1222 2008-04-09 04:40:30Z carenas $
-if [ -x /usr/bin/autoreconf ]; then {
-echo "Bootstrapping libmetrics"
-cd libmetrics && autoreconf --verbose --install --make
-cd ..
-
-echo "Create distribution timestamp"
-touch Makefile.am
-autoreconf --verbose --install --make
-} else {
echo "Bootstrapping libmetrics"
cd libmetrics && ./bootstrap
cd ..
@@ -19,13 +10,14 @@ echo "Running aclocal" &&
aclocal &&
echo "Running autoheader" &&
autoheader &&
-echo "Running libtoolize"&&
-mkdir -p build && libtoolize --copy
+echo "Creating build" &&
+mkdir -p build &&
echo "Running automake" &&
-automake --add-missing --copy &&
+automake --add-missing --copy 2>/dev/null
+echo "Running libtoolize" &&
+libtoolize --automake --copy && automake --add-missing --copy &&
echo "Running autoconf" &&
autoconf
-}; fi
echo &&
echo "To begin installation, run \"./configure\" now"
diff -urp ganglia-3.1/libmetrics/bootstrap ganglia-3.1/libmetrics/bootstrap
--- ganglia-3.1/libmetrics/bootstrap 2008-04-18 18:13:23.000000000 -0700
+++ ganglia-3.1/libmetrics/bootstrap 2008-06-11 16:04:01.000000000 -0700
@@ -1,18 +1,16 @@
#!/bin/sh
-# $Id: bootstrap 388 2004-11-18 02:24:06Z massie $
-if [ -d ../autotools ]; then
- PATH=../autotools/bin:${PATH}
-fi
#echo "Running make distclean"
#make distclean
-echo "Running aclocal" &&
-aclocal &&
-echo "Running autoheader" &&
-autoheader &&
-echo "Running libtoolize" &&
-mkdir -p build && libtoolize --copy &&
+echo "Running aclocal" &&
+aclocal &&
+echo "Running autoheader" &&
+autoheader &&
+echo "Creating build" &&
+mkdir -p build &&
echo "Running automake" &&
-automake --add-missing --copy &&
+automake --add-missing --copy 2>/dev/null
+echo "Running libtoolize" &&
+libtoolize --automake --copy && automake --add-missing --copy &&
echo "Running autoconf" &&
autoconf &&
echo
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Ganglia-developers mailing list
Ganglia-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ganglia-developers
