Hi,
This one is also a resubmit/fix of a patch originally posted for 0.7.4,
we need to use the value stored in WCM_ARCH (from gcc -dumpmachine)
instead of `uname -m` to determine if the target host is 64 or 32 bit,
otherwise it is impossible to cross-build 32bit packages on a 64bit
machine (and vice versa). Its the compiler target, not the running
kernel type, that is the important factor here.
Cheers,
Ron
--- linuxwacom/acinclude.m4 2 Jun 2007 14:06:15 -0000 1.13
+++ linuxwacom/acinclude.m4 4 Jun 2007 07:30:05 -0000
@@ -50,13 +50,8 @@
[ WCM_OPTION_XSERVER64=$enableval
],
[
- if test "$WCM_OPTION_XSERVER64" = ""; then
- if test `uname -m | grep -c "64"` = 0; then
- WCM_OPTION_XSERVER64=no
- else
- WCM_OPTION_XSERVER64=yes
- fi
- fi
+ WCM_OPTION_XSERVER64=no
+ test `echo $WCM_ARCH | grep -c "64"` == 0 || WCM_OPTION_XSERVER64=yes
])
WCM_XLIBDIR_DEFAULT=/usr/X11R6/lib
@@ -64,9 +59,8 @@
if test "$WCM_OPTION_XSERVER64" = "yes"; then
CFLAGS="$CFLAGS -D__amd64__"
WCM_XSERVER64="-D_XSERVER64"
- if test `uname -m | grep -c "x86_64"` != 0; then
- WCM_KSTACK="-mpreferred-stack-boundary=4 -mcmodel=kernel"
- fi
+ test `echo $WCM_ARCH | grep -c "x86_64"` == 0 ||
+ WCM_KSTACK="-mpreferred-stack-boundary=4 -mcmodel=kernel"
WCM_XLIBDIR_DEFAULT=/usr/X11R6/lib64
if test -d /usr/lib64; then
WCM_XLIBDIR_DEFAULT2=/usr/lib64
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Linuxwacom-discuss mailing list
Linuxwacom-discuss@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-discuss
