|
 |
7c454f9 |
diff -up gnuradio-3.2.2/config/gr_lib64.m4.64bit gnuradio-3.2.2/config/gr_lib64.m4
|
|
|
7c454f9 |
--- gnuradio-3.2.2/config/gr_lib64.m4.64bit 2010-09-07 10:50:42.000000000 +0200
|
|
|
7c454f9 |
+++ gnuradio-3.2.2/config/gr_lib64.m4 2010-09-07 10:53:15.000000000 +0200
|
|
|
7c454f9 |
@@ -21,14 +21,14 @@ dnl
|
|
|
7c454f9 |
|
|
|
7c454f9 |
dnl GR_LIB64()
|
|
|
7c454f9 |
dnl
|
|
|
7c454f9 |
-dnl Checks to see if we're on a x86_64 or powerpc64 machine, and if so, determine
|
|
|
7c454f9 |
+dnl Checks to see if we're on a x86_64, powerpc64, sparc64 or s390x machine, and if so, determine
|
|
|
7c454f9 |
dnl if libdir should end in "64" or not.
|
|
|
7c454f9 |
dnl
|
|
|
7c454f9 |
dnl Sets gr_libdir_suffix to "" or "64" and calls AC_SUBST(gr_libdir_suffix)
|
|
|
7c454f9 |
dnl May append "64" to libdir.
|
|
|
7c454f9 |
dnl
|
|
|
7c454f9 |
dnl The current heuristic is:
|
|
|
7c454f9 |
-dnl if the host_cpu isn't x86_64 or powerpc64, then ""
|
|
|
7c454f9 |
+dnl if the host_cpu isn't x86_64 or powerpc64 or sparc64 or s390x, then ""
|
|
|
7c454f9 |
dnl if the host_os isn't linux, then ""
|
|
|
7c454f9 |
dnl if we're cross-compiling, ask the linker, by way of the selected compiler
|
|
|
7c454f9 |
dnl if we're x86_64 and there's a /lib64 and it's not a symlink, then "64", else ""
|
|
|
7c454f9 |
@@ -47,7 +47,8 @@ AC_DEFUN([GR_LIB64],[
|
|
|
7c454f9 |
*) is_linux=no ;;
|
|
|
7c454f9 |
esac
|
|
|
7c454f9 |
|
|
|
7c454f9 |
- if test "$is_linux" = no || test "$host_cpu" != "x86_64" && test "$host_cpu" != "powerpc64"; then
|
|
|
7c454f9 |
+ if test "$is_linux" = no || test "$host_cpu" != "x86_64" && test "$host_cpu" != "powerpc64" \
|
|
|
7c454f9 |
+ && test "$host_cpu" != "sparc64" && test "$host_cpu" != "s390x"; then
|
|
|
7c454f9 |
gr_libdir_suffix=""
|
|
|
7c454f9 |
elif test "$cross_compiling" = yes; then
|
|
|
7c454f9 |
_GR_LIB64_ASK_COMPILER
|