On 2006-05-11T12:40:19, [email protected] wrote:
> linux-ha CVS committal
>
> Author : alan
> Host :
> Module : linux-ha
>
> Dir : linux-ha
>
>
> Modified Files:
> configure.in ConfigureMe
>
>
> Log Message:
> Moved the detection and dealing with 64-bit libraries, etc. from ConfigureMe
> to configure
> This means that our .src.rpms will usable on either 32 or 64-bit platforms.
> Before, they weren't.
>
> ===================================================================
> RCS file: /home/cvs/linux-ha/linux-ha/configure.in,v
> retrieving revision 1.512
> retrieving revision 1.513
> diff -u -3 -r1.512 -r1.513
> --- configure.in 4 May 2006 15:59:05 -0000 1.512
> +++ configure.in 11 May 2006 18:40:18 -0000 1.513
> @@ -10,7 +10,7 @@
> AC_INIT(heartbeat.spec.in)
>
> AC_CONFIG_AUX_DIR(.)
> -AC_REVISION($Revision: 1.512 $) dnl cvs revision
> +AC_REVISION($Revision: 1.513 $) dnl cvs revision
> AC_CANONICAL_HOST
>
>
> @@ -57,6 +57,22 @@
> ;;
> esac
>
> +needs_64_bit_libs() {
> + case `uname -m` in
> + x86_64)
> + # Hmmm... Let's check for building from chrooted 32-bit environment...
> + case `file /bin/uname` in
> + *64-bit*|*x86-64*) true;;
> + *80?86*) false;;
> + *) true;;
> + esac
> + ;;
> + # FIXME. I don't think this is completely general enough.
> + s390*) true;;
> + *) false;;
> + esac
> +}
> +
> AC_SUBST(INIT_EXT)
> AC_SUBST(USE_MODULES)
>
> @@ -168,6 +184,7 @@
> dnl Keep copy of original (default) localstatedir
> localstatedir_orig="$localstatedir"
>
> +
> exec_prefix=`var "$exec_prefix" "$prefix"`
> bindir=`var "$bindir" "$exec_prefix/bin"`
> sbindir=`var "$sbindir" "$exec_prefix/sbin"`
> @@ -183,6 +200,25 @@
> mandir=`var "$mandir" "$exec_prefix/man"`
> docdir=${datadir}/doc/${HB_PKG}-${VERSION}
>
> +if
> + needs_64_bit_libs
> +then
> + case $libdir in
> + *64*) ;;
> + *) old=$libdir
> + libdir=$exec_prefix/lib64
> + AC_MSG_WARN(overriding libdir from $old to $libdir)
> + ;;
> + esac
> + case $libexecdir in
> + *64*) ;;
> + *) old=$libexecdir
> + libexecdir=$exec_prefix/lib64
> + AC_MSG_WARN(overriding libexecdir from $old to $libexecdir)
> + ;;
> + esac
> +fi
> +
This breaks some architectures :-(
s390 for example does NOT need lib64. s390x does.
And, you're even over-writing paths passed in _explicitly_ on the
commandline (say, by a an rpm spec file which knows better).
Could you please revert that chunk?
Sincerely,
Lars Marowsky-Brée
--
High Availability & Clustering
SUSE Labs, Research and Development
SUSE LINUX Products GmbH - A Novell Business -- Charles Darwin
"Ignorance more frequently begets confidence than does knowledge"
_______________________________________________________
Linux-HA-Dev: [email protected]
http://lists.linux-ha.org/mailman/listinfo/linux-ha-dev
Home Page: http://linux-ha.org/
