summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2006-02-14 14:56:56 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2006-02-14 14:56:56 +0000
commit5f881635a03eba868b55f9e8da4fffc110abca6b (patch)
tree6e20092c7590a0e14e7cc39422a7c3947ff574ab
parent1fbbdc6da4ce17046ce29024f4785fb76b18440d (diff)
fix AIX issues (bug 5874)
-rwxr-xr-xbin/installmesa2
-rw-r--r--configs/aix-gcc2
-rw-r--r--docs/VERSIONS9
3 files changed, 12 insertions, 1 deletions
diff --git a/bin/installmesa b/bin/installmesa
index 8d1ee992dc..fb68047af8 100755
--- a/bin/installmesa
+++ b/bin/installmesa
@@ -53,6 +53,8 @@ if [ `uname` = "FreeBSD" ] ; then
CP_FLAGS="-f"
elif [ `uname` = "Darwin" ] ; then
CP_FLAGS="-f"
+elif [ `uname` = "AIX" ] ; then
+ CP_FLAGS="-fh"
else
CP_FLAGS="-fd"
fi
diff --git a/configs/aix-gcc b/configs/aix-gcc
index 5f10bf25dc..cc55551050 100644
--- a/configs/aix-gcc
+++ b/configs/aix-gcc
@@ -14,6 +14,6 @@ CXXFLAGS = -O2 -DAIXV3
MKLIB_OPTIONS = -arch aix-gcc
GL_LIB_DEPS = -lX11 -lXext -lm
GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm
-GLUT_LIB_DEPS = -L$(LIB_DIR -l$(GLU_LIB) -l$(GL_LIB) -lXi -lXmu
+GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lXi -lXmu
APP_LIB_DEPS = -L$(LIB_DIR) -Wl,-brtl -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -lX11 -lXext -lXmu -lXi
diff --git a/docs/VERSIONS b/docs/VERSIONS
index 35fb461e07..ccded8343b 100644
--- a/docs/VERSIONS
+++ b/docs/VERSIONS
@@ -1432,3 +1432,12 @@ Mesa Version History
- GLw header files weren't installed by installmesa script (bug 5396)
- GL/glfbdev.h file was missing from tarballs
- fixed TNL initialization bug which could lead to crash (bug 5791)
+
+
+6.4.3 TBD
+ New:
+ -
+ Bug fixes:
+ - fixed glxcontextmodes.c datatype problem (bug 5835)
+ - fixed aix-gcc build/install bugs (bug 5874)
+