From 2c5b8ec6d95cf68650265941530e5ce38c8dd6d9 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Thu, 9 Dec 2004 09:47:41 +0000 Subject: Merge oe-devel@oe-devel.bkbits.net:openembedded into hyperion.kergoth.com:/home/kergoth/code/openembedded 2004/12/09 03:39:39-06:00 kergoth.com!kergoth Break people's builds again.. this time moving the packages into a packages/ subdir to clean things up a bit. BKrev: 41b81f3dvlp3rU7_8MUXLcI8LDdDoA --- mesa/Make-config.patch | 26 -------------------------- mesa/mesa_6.0.1.bb | 0 mesa/mklib.patch | 22 ---------------------- 3 files changed, 48 deletions(-) delete mode 100644 mesa/Make-config.patch delete mode 100644 mesa/mesa_6.0.1.bb delete mode 100644 mesa/mklib.patch (limited to 'mesa') diff --git a/mesa/Make-config.patch b/mesa/Make-config.patch deleted file mode 100644 index cfe8890e3b..0000000000 --- a/mesa/Make-config.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- 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/mesa/mesa_6.0.1.bb b/mesa/mesa_6.0.1.bb deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/mesa/mklib.patch b/mesa/mklib.patch deleted file mode 100644 index 7dc1ec76a7..0000000000 --- a/mesa/mklib.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- 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 -- cgit v1.2.3