Hi Matt,
some of the local modifications went away when I "accidentially"
upgraded automake for 1.8.3 to 1.8.5. I am down to two files now:
"aclocal.m4" and "configure". These seem to be "real" modifications.
See below.
Maybe the CVS-users documentation should be updaten to reflect new
minimum release levels for the toolchain.
--- Matt Massie <[EMAIL PROTECTED]> wrote:
>
> the reason you are seeing that your local copy has been modified is
> because the time on your machine is not in sync with the sourceforge
> cvs
> server. when you update cvs, cvs syncs the timestamps of your files
> to
> the time on the cvs server which then causes autoconf/make/et al to
> recreate files (such as Makefile.in and aclocal.m4). that is a
> problem
> given that it is possible (likely) that the toolchain used to create
> libraries in ./srclib are uniquely different than the ganglia
> distribution in general.
>
hmm. The files are actually changed. Just did a "cvs diff" on one of
them. Some of the changes look "real":
bash-2.05b$ cvs -z3 -q diff -c srclib/confuse/aclocal.m4
Index: srclib/confuse/aclocal.m4
===================================================================
RCS file: /cvsroot/ganglia/monitor-core/srclib/confuse/aclocal.m4,v
retrieving revision 1.2
diff -c -r1.2 aclocal.m4
*** srclib/confuse/aclocal.m4 6 Dec 2004 23:46:03 -0000 1.2
--- srclib/confuse/aclocal.m4 22 Dec 2004 09:03:52 -0000
***************
*** 1432,1441 ****
# before this can be enabled.
hardcode_into_libs=yes
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
lt_ld_extra=`$SED -e 's/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g'
/etc/ld.so.conf | tr '\n' ' '`
! sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
--- 1432,1458 ----
# before this can be enabled.
hardcode_into_libs=yes
+ # find out which ABI we are using
+ libsuff=
+ case "$host_cpu" in
+ x86_64*|s390x*|powerpc64*)
+ echo '[#]line __oline__ "configure"' > conftest.$ac_ext
+ if AC_TRY_EVAL(ac_compile); then
+ case `/usr/bin/file conftest.$ac_objext` in
+ *64-bit*)
+ libsuff=64
+ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff}
/usr/local/lib${libsuff}"
+ ;;
+ esac
+ fi
+ rm -rf conftest*
+ ;;
+ esac
+
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
lt_ld_extra=`$SED -e 's/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g'
/etc/ld.so.conf | tr '\n' ' '`
! sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}
$lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
***************
*** 2175,2181 ****
# This must be Linux ELF.
linux*)
case $host_cpu in
! alpha*|hppa*|i*86|ia64*|m68*|mips*|powerpc*|sparc*|s390*|sh*)
lt_cv_deplibs_check_method=pass_all ;;
*)
# glibc up to 2.1.1 does not perform some relocations on ARM
--- 2192,2198 ----
# This must be Linux ELF.
linux*)
case $host_cpu in
!
alpha*|hppa*|i*86|ia64*|m68*|mips*|powerpc*|sparc*|s390*|sh*|x86_64*)
lt_cv_deplibs_check_method=pass_all ;;
*)
# glibc up to 2.1.1 does not perform some relocations on ARM
> the workaround is to run something like the following before you run
> "bootstrap"
>
> % touch /tmp/foo && find . -exec touch -r /tmp/foo {} \;
>
This helps indeed, but I am not sure it is the right thing to do.
Cheers
Martin
=====
------------------------------------------------------
Martin Knoblauch
email: k n o b i AT knobisoft DOT de
www: http://www.knobisoft.de
