diff options
| author | anholt <anholt@FreeBSD.org> | 2004-12-30 06:41:28 +0800 |
|---|---|---|
| committer | anholt <anholt@FreeBSD.org> | 2004-12-30 06:41:28 +0800 |
| commit | 00f3863deffe6cbff5edf6a1fea39f107081ed89 (patch) | |
| tree | 35bd0b25f20553f8d039c589b316e1404626211a /graphics/dri | |
| parent | 550e9a37c1a27beaf1d3fed81ebed3ba37da1b07 (diff) | |
| download | freebsd-ports-gnome-00f3863deffe6cbff5edf6a1fea39f107081ed89.tar.gz freebsd-ports-gnome-00f3863deffe6cbff5edf6a1fea39f107081ed89.tar.zst freebsd-ports-gnome-00f3863deffe6cbff5edf6a1fea39f107081ed89.zip | |
[1] Try to respect PTHREAD_LIBS, to unbreak the build on 4.x.
[2] Respect CXXFLAGS a little more thoroughly.
PR: [1] ports/75473
Submitted by: [1] KIMURA Yasuhiro, yasu at utahime dot org, among many others
Based on: [1] patch by thierry
Diffstat (limited to 'graphics/dri')
| -rw-r--r-- | graphics/dri/Makefile | 3 | ||||
| -rw-r--r-- | graphics/dri/files/patch-freebsd-dri | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/graphics/dri/Makefile b/graphics/dri/Makefile index d6f553c465c6..75a1227256f8 100644 --- a/graphics/dri/Makefile +++ b/graphics/dri/Makefile @@ -27,7 +27,8 @@ USE_X_PREFIX= yes USE_BZIP2= yes USE_GMAKE= yes MAKE_ENV+= FBSDCC="${CC}" FBSDCXX="${CXX}" \ - FBSDCFLAGS="${CFLAGS}" FBSDCXXFLAGS="${CXXFLAGS}" + FBSDCFLAGS="${CFLAGS}" FBSDCXXFLAGS="${CXXFLAGS}" \ + PTHREAD_LIBS=${PTHREAD_LIBS} ONLY_FOR_ARCHS= i386 alpha amd64 diff --git a/graphics/dri/files/patch-freebsd-dri b/graphics/dri/files/patch-freebsd-dri index bdf12da53e36..1b68eca25bfe 100644 --- a/graphics/dri/files/patch-freebsd-dri +++ b/graphics/dri/files/patch-freebsd-dri @@ -17,7 +17,7 @@ +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 \ ++CXXFLAGS = $(FBSDCXXFLAGS) -DDRI_NEW_INTERFACE_ONLY -Wall -g -ansi -pedantic \ + -fPIC ASM_SOURCES = @@ -25,8 +25,8 @@ # 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 ++DRI_LIB_DEPS = -L$(LOCALBASE)/lib -lm -lexpat ${PTHREAD_LIBS} ++GL_LIB_DEPS = -L$(X11BASE) -lX11 -lXext -lm ${PTHREAD_LIBS} 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 |