diff options
| author |   Koen Kooi <koen@openembedded.org> | 2005-06-30 08:19:37 +0000 |
|---|---|---|
| committer |   OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-06-30 08:19:37 +0000 |
| commit | c8e5702127e507e82e6f68a4b8c546803accea9d (patch) | |
| tree | 00583491f40ecc640f2b28452af995e3a63a09d7 /packages/mesa | |
| parent | 87ec8ca4d2e2eb4d1c1e1e1a6b46a395d56805b9 (diff) | |
| download | openembedded-c8e5702127e507e82e6f68a4b8c546803accea9d.tar.gz | |
import clean BK tree at cset 1.3670
Diffstat (limited to 'packages/mesa')
| -rw-r--r-- | packages/mesa/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/mesa/Make-config.patch | 26 | ||||
| -rw-r--r-- | packages/mesa/mklib.patch | 22 |
3 files changed, 48 insertions, 0 deletions
diff --git a/packages/mesa/.mtn2git_empty b/packages/mesa/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/mesa/.mtn2git_empty diff --git a/packages/mesa/Make-config.patch b/packages/mesa/Make-config.patch index e69de29bb2..cfe8890e3b 100644 --- a/packages/mesa/Make-config.patch +++ b/packages/mesa/Make-config.patch @@ -0,0 +1,26 @@ +--- mesa/Make-config.orig 2004-06-25 13:09:44.000000000 +0100 ++++ mesa/Make-config 2004-06-25 14:18:27.000000000 +0100 +@@ -643,16 +643,16 @@ + "GLUT_LIB = libglut.so" \ + "GLW_LIB = libGLw.so" \ + "OSMESA_LIB = libOSMesa.so" \ +- "CC = gcc" \ +- "CXX = g++" \ +- "CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include" \ +- "CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE" \ ++ "CC = $(CC)" \ ++ "CXX = $(CXX)" \ ++ "CFLAGS = -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS $(CFLAGS)" \ ++ "CXXFLAGS = -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE $(CXXFLAGS)" \ + "GLUT_CFLAGS = -fexceptions" \ +- "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread" \ ++ "GL_LIB_DEPS = $(LDFLAGS) -lX11 -lXext -lm -lpthread" \ + "OSMESA_LIB_DEPS = -L$(TOP)/lib -lGL" \ + "GLU_LIB_DEPS = -L$(TOP)/lib -lGL -lm" \ +- "GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \ +- "GLW_LIB_DEPS = -L$(TOP)/lib -lGL -L/usr/X11R6/lib -lXt -lX11" \ ++ "GLUT_LIB_DEPS = $(LDFLAGS) -L$(TOP)/lib -lGLU -lGL -lX11 -lXmu -lXt -lXi -lm" \ ++ "GLW_LIB_DEPS = $(LDFLAGS) -L$(TOP)/lib -lGL -lXt -lX11" \ + "APP_LIB_DEPS = -lglut -lGLU -lGL -lm" + + linux-static: diff --git a/packages/mesa/mklib.patch b/packages/mesa/mklib.patch index e69de29bb2..7dc1ec76a7 100644 --- a/packages/mesa/mklib.patch +++ b/packages/mesa/mklib.patch @@ -0,0 +1,22 @@ +--- mesa/bin/mklib.old 2004-06-25 14:08:41.000000000 +0100 ++++ mesa/bin/mklib 2004-06-25 14:23:09.000000000 +0100 +@@ -64,6 +64,7 @@ + '-install') shift 1; INSTALLDIR=$1;; + '-arch') shift 1; ARCH=$1;; + '-archopt') shift 1; ARCHOPT=$1;; ++ -Wl*) DEPS="$DEPS $1";; + -*) echo "mklib: Unknown option: " $1 ; exit 1;; + *) break + esac +@@ -137,9 +138,9 @@ + echo "mklib: Making" $ARCH "shared library: " ${LIBNAME}.so.${VERSION} + + if [ $CPLUSPLUS = 1 ] ; then +- LINK="g++" ++ LINK="$CXX" + else +- LINK="gcc" ++ LINK="$CC" + fi + + # rm any old libs |