Brian Paul <[email protected]> writes:
> Please test and report any problems ASAP. If there aren't any issues
> we'd like to release 7.6.1 on Friday or Saturday.
We've had the attached AIX patch locally for a while now. Sorry I
didn't send it earlier. I wrote a small C program to compare it to
Linux's bswap_32 and it seems to work, but I'll note it's untested in
Mesa; for build-dep reasons, we need an Xlib-based Mesa, but we never
call that code at runtime. Further, I inserted #error blah in the
define used here, and the Mesa build succeeded... so this is obviously
never even called in the configurations I am concerned with.
Secondly, the AIX build is failing in progs/Makefile. The quoting
introduced in 115edf24a9128b79dfa5f30482c990e2cb898357 and removed in
31f7e8efb25a77e3bdfb6e9850cf31e339060976 was important. Otherwise,
SUBDIRS will end up being " " or maybe " " and test -n will
(annoyingly) fail, causing the `for'-over-nothing to execute.
The (second) attached patch fixes it, I believe in both cases. At
least, with Mesa-7.6.1-rc1 I get the error mentioned in 31f7.. from
`make linux', and now I don't (and it still works on AIX).
-tom
From c473f6a879ced3288ac6cfe9e5cd20a391e5684a Mon Sep 17 00:00:00 2001
From: Tom Fogal <[email protected]>
Date: Wed, 18 Nov 2009 19:54:20 -0700
Subject: [PATCH 1/2] Define 32bit byteswap for AIX.
Fixes `xlib' driver build on AIX.
---
src/mesa/main/compiler.h | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/mesa/main/compiler.h b/src/mesa/main/compiler.h
index 9319505..522295a 100644
--- a/src/mesa/main/compiler.h
+++ b/src/mesa/main/compiler.h
@@ -235,7 +235,12 @@ extern "C" {
#elif defined(__APPLE__)
#include <CoreFoundation/CFByteOrder.h>
#define CPU_TO_LE32( x ) CFSwapInt32HostToLittle( x )
-#else /*__linux__ __APPLE__*/
+#elif defined(_AIX)
+#define CPU_TO_LE32( x ) x = ((x & 0x000000ff) << 24) | \
+ ((x & 0x0000ff00) << 8) | \
+ ((x & 0x00ff0000) >> 8) | \
+ ((x & 0xff000000) >> 24);
+#else /*__linux__ */
#include <sys/endian.h>
#define CPU_TO_LE32( x ) bswap32( x )
#endif /*__linux__*/
--
1.6.3.3
From b2956c004c0a84dd88ba14c4276eba6154f59861 Mon Sep 17 00:00:00 2001
From: Tom Fogal <[email protected]>
Date: Wed, 18 Nov 2009 20:19:29 -0700
Subject: [PATCH 2/2] Fix quoting issue with empty set of PROGRAM_DIRS.
Quotes are important to make sure the argument to test -n really
is the empty string, but that requires stringifying PROGRAM_DIRS.
---
progs/Makefile | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/progs/Makefile b/progs/Makefile
index 3700707..d5852fa 100644
--- a/progs/Makefile
+++ b/progs/Makefile
@@ -4,7 +4,7 @@ TOP = ..
include $(TOP)/configs/current
-SUBDIRS = $(PROGRAM_DIRS)
+SUBDIRS = "$(strip "$(PROGRAM_DIRS)")"
default: message subdirs
--
1.6.3.3
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Mesa3d-dev mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
