Update build-config patch again to *really* avoid building GLw.
This commit is contained in:
Kristian Høgsberg
parent
68ba098688
commit
60efe508bd
@ -1,109 +1,7 @@
|
||||
--- Mesa-6.5.1/configs/linux-dri-ppc.build-config 2005-08-19 18:03:05.000000000 -0400
|
||||
+++ Mesa-6.5.1/configs/linux-dri-ppc 2006-08-25 15:53:24.000000000 -0400
|
||||
@@ -5,7 +5,7 @@ include $(TOP)/configs/linux-dri
|
||||
--- ./configs/default.build-config 2006-09-11 17:35:46.000000000 -0400
|
||||
+++ ./configs/default 2006-09-19 15:52:09.000000000 -0400
|
||||
@@ -59,8 +59,8 @@
|
||||
|
||||
CONFIG_NAME = linux-dri-ppc
|
||||
|
||||
-OPT_FLAGS = -Os -mcpu=603
|
||||
+OPT_FLAGS ?= -Os -mcpu=603
|
||||
PIC_FLAGS = -fPIC
|
||||
|
||||
ASM_FLAGS = -DUSE_PPC_ASM -DUSE_VMX_ASM
|
||||
--- Mesa-6.5.1/configs/linux-dri-x86.build-config 2005-09-12 11:03:11.000000000 -0400
|
||||
+++ Mesa-6.5.1/configs/linux-dri-x86 2006-08-25 15:53:24.000000000 -0400
|
||||
@@ -6,7 +6,7 @@ include $(TOP)/configs/linux-dri
|
||||
CONFIG_NAME = linux-dri-x86
|
||||
|
||||
# Unnecessary on x86, generally.
|
||||
-PIC_FLAGS =
|
||||
+# PIC_FLAGS =
|
||||
|
||||
# Add -m32 to CFLAGS:
|
||||
ARCH_FLAGS = -m32
|
||||
--- Mesa-6.5.1/configs/linux-dri-x86-64.build-config 2006-08-25 15:53:41.000000000 -0400
|
||||
+++ Mesa-6.5.1/configs/linux-dri-x86-64 2006-08-25 15:53:51.000000000 -0400
|
||||
@@ -20,5 +20,5 @@ EXTRA_LIB_PATH=-L/usr/X11R6/lib64
|
||||
# the new interface. i810 are missing because there is no x86-64
|
||||
# system where they could *ever* be used.
|
||||
#
|
||||
-DRI_DIRS = i915 mach64 mga r128 r200 radeon tdfx unichrome savage r300
|
||||
+DRI_DIRS = i915 i965 mach64 mga r128 r200 radeon tdfx unichrome savage r300
|
||||
|
||||
--- Mesa-6.5.1/configs/linux-osmesa16.build-config 2006-07-12 22:43:20.000000000 -0400
|
||||
+++ Mesa-6.5.1/configs/linux-osmesa16 2006-08-25 15:53:24.000000000 -0400
|
||||
@@ -17,7 +17,7 @@ OSMESA_LIB_NAME = libOSMesa16.so
|
||||
|
||||
|
||||
# Directories
|
||||
-SRC_DIRS = mesa glu
|
||||
+SRC_DIRS = mesa
|
||||
DRIVER_DIRS = osmesa
|
||||
PROGRAM_DIRS =
|
||||
|
||||
--- Mesa-6.5.1/configs/linux.build-config 2006-08-17 10:39:11.000000000 -0400
|
||||
+++ Mesa-6.5.1/configs/linux 2006-08-25 15:53:24.000000000 -0400
|
||||
@@ -8,7 +8,9 @@ CONFIG_NAME = linux
|
||||
CC = gcc
|
||||
CXX = g++
|
||||
|
||||
-OPT_FLAGS = -O3 -g
|
||||
+MKDEP = true
|
||||
+
|
||||
+OPT_FLAGS ?= -O3 -g
|
||||
PIC_FLAGS = -fPIC
|
||||
|
||||
# Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support. Add -m32
|
||||
--- Mesa-6.5.1/configs/linux-dri.build-config 2006-08-17 10:09:02.000000000 -0400
|
||||
+++ Mesa-6.5.1/configs/linux-dri 2006-08-25 15:53:24.000000000 -0400
|
||||
@@ -12,8 +12,9 @@ CXX = g++
|
||||
#MKDEP = /usr/X11R6/bin/makedepend
|
||||
#MKDEP = gcc -M
|
||||
#MKDEP_OPTIONS = -MF depend
|
||||
+MKDEP = true
|
||||
|
||||
-OPT_FLAGS = -O -g
|
||||
+OPT_FLAGS ?= -O -g
|
||||
PIC_FLAGS = -fPIC
|
||||
|
||||
# Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support.
|
||||
@@ -24,8 +25,6 @@ DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOU
|
||||
-DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \
|
||||
-DGLX_DIRECT_RENDERING -DHAVE_ALIAS -DHAVE_POSIX_MEMALIGN
|
||||
|
||||
-X11_INCLUDES = -I/usr/X11R6/include
|
||||
-
|
||||
CFLAGS = -Wall -Wmissing-prototypes -std=c99 -ffast-math \
|
||||
$(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) $(ASM_FLAGS)
|
||||
|
||||
@@ -35,7 +34,7 @@ CXXFLAGS = -Wall $(OPT_FLAGS) $(PIC_FLAG
|
||||
ASM_SOURCES =
|
||||
|
||||
# Library/program dependencies
|
||||
-EXTRA_LIB_PATH=-L/usr/X11R6/lib
|
||||
+EXTRA_LIB_PATH =
|
||||
|
||||
LIBDRM_CFLAGS = `pkg-config --cflags libdrm`
|
||||
LIBDRM_LIB = `pkg-config --libs libdrm`
|
||||
@@ -65,4 +64,4 @@ WINDOW_SYSTEM=dri
|
||||
# gamma are missing because they have not been converted to use the new
|
||||
# interface.
|
||||
DRI_DIRS = i810 i915 i965 mach64 mga r128 r200 r300 radeon s3v \
|
||||
- savage sis tdfx trident unichrome ffb
|
||||
+ savage tdfx trident unichrome ffb # sis
|
||||
--- Mesa-6.5.1/configs/linux-osmesa32.build-config 2006-07-12 22:43:20.000000000 -0400
|
||||
+++ Mesa-6.5.1/configs/linux-osmesa32 2006-08-25 15:53:24.000000000 -0400
|
||||
@@ -17,7 +17,7 @@ OSMESA_LIB_NAME = libOSMesa32.so
|
||||
|
||||
|
||||
# Directories
|
||||
-SRC_DIRS = mesa glu
|
||||
+SRC_DIRS = mesa
|
||||
DRIVER_DIRS = osmesa
|
||||
PROGRAM_DIRS =
|
||||
|
||||
--- Mesa-6.5.1/configs/default.build-config 2006-07-20 12:08:04.000000000 -0400
|
||||
+++ Mesa-6.5.1/configs/default 2006-08-25 15:53:24.000000000 -0400
|
||||
@@ -60,6 +60,6 @@
|
||||
|
||||
# Directories to build
|
||||
-LIB_DIR = lib
|
||||
@ -112,7 +10,8 @@
|
||||
+SRC_DIRS = mesa glu glut/glx
|
||||
GLU_DIRS = sgi
|
||||
DRIVER_DIRS = x11 osmesa
|
||||
@@ -73,14 +73,14 @@ GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -l
|
||||
# Which subdirs under $(TOP)/progs/ to enter:
|
||||
@@ -73,14 +73,14 @@
|
||||
OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)
|
||||
GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm
|
||||
GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lm
|
||||
@ -129,9 +28,125 @@
|
||||
|
||||
# Where libGL will look for DRI hardware drivers
|
||||
DRI_DRIVER_SEARCH_DIR = $(DRI_DRIVER_INSTALL_DIR)
|
||||
--- Mesa-6.5.1/configs/linux-osmesa.build-config 2006-07-12 22:43:20.000000000 -0400
|
||||
+++ Mesa-6.5.1/configs/linux-osmesa 2006-08-25 15:53:24.000000000 -0400
|
||||
@@ -14,9 +14,9 @@ CXXFLAGS = -O3 -ansi -pedantic -fPIC -ff
|
||||
--- ./configs/linux-dri.build-config 2006-08-17 10:09:02.000000000 -0400
|
||||
+++ ./configs/linux-dri 2006-09-19 17:49:35.000000000 -0400
|
||||
@@ -12,8 +12,9 @@
|
||||
#MKDEP = /usr/X11R6/bin/makedepend
|
||||
#MKDEP = gcc -M
|
||||
#MKDEP_OPTIONS = -MF depend
|
||||
+MKDEP = true
|
||||
|
||||
-OPT_FLAGS = -O -g
|
||||
+OPT_FLAGS ?= -O -g
|
||||
PIC_FLAGS = -fPIC
|
||||
|
||||
# Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support.
|
||||
@@ -24,8 +25,6 @@
|
||||
-DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \
|
||||
-DGLX_DIRECT_RENDERING -DHAVE_ALIAS -DHAVE_POSIX_MEMALIGN
|
||||
|
||||
-X11_INCLUDES = -I/usr/X11R6/include
|
||||
-
|
||||
CFLAGS = -Wall -Wmissing-prototypes -std=c99 -ffast-math \
|
||||
$(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) $(ASM_FLAGS)
|
||||
|
||||
@@ -35,7 +34,7 @@
|
||||
ASM_SOURCES =
|
||||
|
||||
# Library/program dependencies
|
||||
-EXTRA_LIB_PATH=-L/usr/X11R6/lib
|
||||
+EXTRA_LIB_PATH =
|
||||
|
||||
LIBDRM_CFLAGS = `pkg-config --cflags libdrm`
|
||||
LIBDRM_LIB = `pkg-config --libs libdrm`
|
||||
@@ -52,10 +51,10 @@
|
||||
|
||||
# Directories
|
||||
ifeq ($(USING_EGL), 1)
|
||||
-SRC_DIRS = egl glx/x11 mesa glu glut/glx glw
|
||||
+SRC_DIRS = egl glx/x11 mesa glu glut/glx
|
||||
PROGRAM_DIRS = egl
|
||||
else
|
||||
-SRC_DIRS = glx/x11 mesa glu glut/glx glw
|
||||
+SRC_DIRS = glx/x11 mesa glu glut/glx
|
||||
PROGRAM_DIRS =
|
||||
endif
|
||||
|
||||
@@ -65,4 +64,4 @@
|
||||
# gamma are missing because they have not been converted to use the new
|
||||
# interface.
|
||||
DRI_DIRS = i810 i915 i965 mach64 mga r128 r200 r300 radeon s3v \
|
||||
- savage sis tdfx trident unichrome ffb
|
||||
+ savage tdfx trident unichrome ffb # sis
|
||||
--- ./configs/linux.build-config 2006-08-24 19:37:59.000000000 -0400
|
||||
+++ ./configs/linux 2006-09-19 15:52:09.000000000 -0400
|
||||
@@ -8,7 +8,9 @@
|
||||
CC = gcc
|
||||
CXX = g++
|
||||
|
||||
-OPT_FLAGS = -O3 -g
|
||||
+MKDEP = true
|
||||
+
|
||||
+OPT_FLAGS ?= -O3 -g
|
||||
PIC_FLAGS = -fPIC
|
||||
|
||||
# Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support. Add -m32
|
||||
--- ./configs/linux-osmesa32.build-config 2006-07-12 22:43:20.000000000 -0400
|
||||
+++ ./configs/linux-osmesa32 2006-09-19 16:00:03.000000000 -0400
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
|
||||
# Directories
|
||||
-SRC_DIRS = mesa glu
|
||||
+SRC_DIRS = mesa
|
||||
DRIVER_DIRS = osmesa
|
||||
PROGRAM_DIRS =
|
||||
|
||||
--- ./configs/linux-osmesa16.build-config 2006-07-12 22:43:20.000000000 -0400
|
||||
+++ ./configs/linux-osmesa16 2006-09-19 15:57:29.000000000 -0400
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
|
||||
# Directories
|
||||
-SRC_DIRS = mesa glu
|
||||
+SRC_DIRS = mesa
|
||||
DRIVER_DIRS = osmesa
|
||||
PROGRAM_DIRS =
|
||||
|
||||
--- ./configs/linux-dri-ppc.build-config 2005-08-19 18:03:05.000000000 -0400
|
||||
+++ ./configs/linux-dri-ppc 2006-09-19 15:52:09.000000000 -0400
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
CONFIG_NAME = linux-dri-ppc
|
||||
|
||||
-OPT_FLAGS = -Os -mcpu=603
|
||||
+OPT_FLAGS ?= -Os -mcpu=603
|
||||
PIC_FLAGS = -fPIC
|
||||
|
||||
ASM_FLAGS = -DUSE_PPC_ASM -DUSE_VMX_ASM
|
||||
--- ./configs/linux-dri-x86.build-config 2005-09-12 11:03:11.000000000 -0400
|
||||
+++ ./configs/linux-dri-x86 2006-09-19 15:52:09.000000000 -0400
|
||||
@@ -6,7 +6,7 @@
|
||||
CONFIG_NAME = linux-dri-x86
|
||||
|
||||
# Unnecessary on x86, generally.
|
||||
-PIC_FLAGS =
|
||||
+# PIC_FLAGS =
|
||||
|
||||
# Add -m32 to CFLAGS:
|
||||
ARCH_FLAGS = -m32
|
||||
--- ./configs/linux-dri-x86-64.build-config 2006-07-12 22:43:20.000000000 -0400
|
||||
+++ ./configs/linux-dri-x86-64 2006-09-19 15:52:09.000000000 -0400
|
||||
@@ -20,5 +20,5 @@
|
||||
# the new interface. i810 are missing because there is no x86-64
|
||||
# system where they could *ever* be used.
|
||||
#
|
||||
-DRI_DIRS = i915 mach64 mga r128 r200 radeon tdfx unichrome savage r300
|
||||
+DRI_DIRS = i915 i965 mach64 mga r128 r200 radeon tdfx unichrome savage r300
|
||||
|
||||
--- ./configs/linux-osmesa.build-config 2006-07-12 22:43:20.000000000 -0400
|
||||
+++ ./configs/linux-osmesa 2006-09-19 15:54:52.000000000 -0400
|
||||
@@ -14,9 +14,9 @@
|
||||
|
||||
|
||||
# Directories
|
||||
|
||||
Loading…
Reference in New Issue
Block a user