From: <ca...@us...> - 2008-06-27 11:31:04
|
Revision: 1468 http://ganglia.svn.sourceforge.net/ganglia/?rev=1468&view=rev Author: carenas Date: 2008-06-27 04:31:13 -0700 (Fri, 27 Jun 2008) Log Message: ----------- build: linux: fix biarch support remove unreliable check for host_cpu which will backfire in powerpc64 where binaries are expect to be build 32-bit by default as reported by Jarod Wilson while building fedora packages for ppc32 and ppc64. use instead an autoconf compile test and file to detect which ABI we are building for to try to guess the right libdir to use for it. Modified Paths: -------------- trunk/monitor-core/configure.in Modified: trunk/monitor-core/configure.in =================================================================== --- trunk/monitor-core/configure.in 2008-06-25 10:36:55 UTC (rev 1467) +++ trunk/monitor-core/configure.in 2008-06-27 11:31:13 UTC (rev 1468) @@ -111,7 +111,6 @@ dnl The following cpu_vendor_os string goes into config.h. dnl AC_DEFINE_UNQUOTED(HOST_OS, "$host_os", HOST_OS) -AC_DEFINE_UNQUOTED(ARCH, "$host_cpu", ARCH) AC_DEFINE_UNQUOTED(CPU_VENDOR_OS, "$host", CPU_VENDOR_OS) dnl AC_CYGWIN @@ -523,8 +522,11 @@ libroot="$exec_prefix" fi - if test x"$host_cpu" = xx86_64 || \ - test x"$host_cpu" = xpowerpc64; then + AC_TRY_COMPILE([], [], [file conftest.$ac_objext > conftest.file]) + FILE=`cat conftest.file` + WIDTH_CPU=`expr "x$FILE" : '.*ELF \(.*\)-bit '` + rm -f conftest.file + if test x"$WIDTH_CPU" = x64; then libdir="$libroot/lib64" else libdir="$libroot/lib" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |