diff options
author | anholt <anholt@FreeBSD.org> | 2004-12-24 17:05:40 +0800 |
---|---|---|
committer | anholt <anholt@FreeBSD.org> | 2004-12-24 17:05:40 +0800 |
commit | 18822b6b812dfadeb19045de4f6e70e4406ca3a0 (patch) | |
tree | 04573737fc2654cf7c9db723f0e6ec72ca2274c4 | |
parent | abb4183f47dab080dae4822c1411aa023cc12a72 (diff) | |
download | freebsd-ports-gnome-18822b6b812dfadeb19045de4f6e70e4406ca3a0.tar.gz freebsd-ports-gnome-18822b6b812dfadeb19045de4f6e70e4406ca3a0.tar.zst freebsd-ports-gnome-18822b6b812dfadeb19045de4f6e70e4406ca3a0.zip |
[1] Link against libexpat so that the drivers actually work.
[2] Respect CC/CFLAGS/etc.
Submitted by: [1] Vladimir Novoseltsev, blacknova at tut dot by
-rw-r--r-- | graphics/dri/Makefile | 2 | ||||
-rw-r--r-- | graphics/dri/files/patch-Makefile.template | 11 | ||||
-rw-r--r-- | graphics/dri/files/patch-freebsd-dri | 32 | ||||
-rw-r--r-- | graphics/dri/files/patch-localvars | 11 |
4 files changed, 45 insertions, 11 deletions
diff --git a/graphics/dri/Makefile b/graphics/dri/Makefile index 185b49b01748..cd8289e1e9b9 100644 --- a/graphics/dri/Makefile +++ b/graphics/dri/Makefile @@ -25,6 +25,8 @@ WRKSRC= ${WRKDIR}/Mesa USE_X_PREFIX= yes USE_BZIP2= yes USE_GMAKE= yes +MAKE_ENV+= FBSDCC="${CC}" FBSDCXX="${CXX}" \ + FBSDCFLAGS="${CFLAGS}" FBSDCXXFLAGS="${CXXFLAGS}" ONLY_FOR_ARCHS= i386 alpha amd64 diff --git a/graphics/dri/files/patch-Makefile.template b/graphics/dri/files/patch-Makefile.template new file mode 100644 index 000000000000..e89035351fa6 --- /dev/null +++ b/graphics/dri/files/patch-Makefile.template @@ -0,0 +1,11 @@ +--- src/mesa/drivers/dri/Makefile.template.orig Fri Dec 24 01:04:59 2004 ++++ src/mesa/drivers/dri/Makefile.template Fri Dec 24 01:05:16 2004 +@@ -75,7 +75,7 @@ + + + $(LIB_DIR)/$(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile $(TOP)/src/mesa/drivers/dri/Makefile.template +- rm -f $@ && gcc -o $@ -shared $(OBJECTS) $(MESA_MODULES) $(WINOBJ) $(GL_LIB_DEPS) ++ rm -f $@ && gcc -o $@ -shared $(OBJECTS) $(MESA_MODULES) $(WINOBJ) $(DRI_LIB_DEPS) + + + diff --git a/graphics/dri/files/patch-freebsd-dri b/graphics/dri/files/patch-freebsd-dri new file mode 100644 index 000000000000..bdf12da53e36 --- /dev/null +++ b/graphics/dri/files/patch-freebsd-dri @@ -0,0 +1,32 @@ +--- configs/freebsd-dri.orig Tue Nov 23 22:59:05 2004 ++++ configs/freebsd-dri Fri Dec 24 00:29:13 2004 +@@ -6,19 +6,22 @@ + CONFIG_NAME = freebsd-dri + + # Compiler and flags +-CC = gcc +-CXX = g++ ++CC = $(FBSDCC) ++CXX = $(FBSDCXX) + WARN_FLAGS = -Wall +-OPT_FLAGS = -O ++OPT_FLAGS = $(FBSDCFLAGS) + +-CFLAGS = -DDRI_NEW_INTERFACE_ONLY -Wmissing-prototypes -g -std=c99 -Wundef -fPIC -ffast-math -I/usr/local/include -I/usr/X11R6/include -I/usr/X11R6/include/X11/extensions +-CXXFLAGS = -DDRI_NEW_INTERFACE_ONLY -Wall -g -ansi -pedantic -fPIC ++CFLAGS = $(FBSDCFLAGS) -DDRI_NEW_INTERFACE_ONLY -Wmissing-prototypes -g \ ++ -std=c9x -Wundef -fPIC -ffast-math -I$(LOCALBASE)/include \ ++ -I$(X11BASE)/include -I$(X11BASE)/include/X11/extensions ++CXXFLAGS += $(FBSDCXXFLAGS) -DDRI_NEW_INTERFACE_ONLY -Wall -g -ansi -pedantic \ ++ -fPIC + + ASM_SOURCES = + + # Library/program dependencies +-DRI_LIB_DEPS = -lm -lpthread -lexpat +-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -pthread ++DRI_LIB_DEPS = -L$(LOCALBASE)/lib -lm -lpthread -lexpat ++GL_LIB_DEPS = -L$(X11BASE) -lX11 -lXext -lm -pthread + + GLUT_LIB_DEPS = -L$(LIB_DIR) -L/usr/X11R6/lib -lGLU -lGL -lX11 -lXmu -lXt -lXi -lm + GLW_LIB_DEPS = -L$(LIB_DIR) -L/usr/X11R6/lib -lGL -lXt -lXm -lX11 diff --git a/graphics/dri/files/patch-localvars b/graphics/dri/files/patch-localvars index 15affd3f6a47..84701342c27a 100644 --- a/graphics/dri/files/patch-localvars +++ b/graphics/dri/files/patch-localvars @@ -1,14 +1,3 @@ ---- configs/freebsd-dri.orig Wed Nov 24 23:14:01 2004 -+++ configs/freebsd-dri Wed Nov 24 23:14:20 2004 -@@ -11,7 +11,7 @@ - WARN_FLAGS = -Wall - OPT_FLAGS = -O - --CFLAGS = -DDRI_NEW_INTERFACE_ONLY -Wmissing-prototypes -g -std=c99 -Wundef -fPIC -ffast-math -I/usr/local/include -I/usr/X11R6/include -I/usr/X11R6/include/X11/extensions -+CFLAGS = -DDRI_NEW_INTERFACE_ONLY -Wmissing-prototypes -g -std=c9x -Wundef -fPIC -ffast-math -I/usr/local/include -I/usr/X11R6/include -I/usr/X11R6/include/X11/extensions - CXXFLAGS = -DDRI_NEW_INTERFACE_ONLY -Wall -g -ansi -pedantic -fPIC - - ASM_SOURCES = --- src/mesa/drivers/dri/r200/r200_tcl.c.orig Thu Nov 25 01:38:38 2004 +++ src/mesa/drivers/dri/r200/r200_tcl.c Thu Nov 25 01:39:09 2004 @@ -101,7 +101,7 @@ |