diff options
| author | anholt <anholt@FreeBSD.org> | 2003-11-09 06:30:36 +0800 |
|---|---|---|
| committer | anholt <anholt@FreeBSD.org> | 2003-11-09 06:30:36 +0800 |
| commit | 02691585be0f657ac20dfc145008106ed93baf73 (patch) | |
| tree | 4d486ad3234e20600e81f99c636c6a9bd83b1a4e /graphics | |
| parent | ef25fe7b191e7d2500840af0132b0e4812b70c30 (diff) | |
| download | freebsd-ports-gnome-02691585be0f657ac20dfc145008106ed93baf73.tar.gz freebsd-ports-gnome-02691585be0f657ac20dfc145008106ed93baf73.tar.zst freebsd-ports-gnome-02691585be0f657ac20dfc145008106ed93baf73.zip | |
Link mesa-demos against ${PTHREAD_LIBS}. Supposed to prevent crashing on
-stable.
Submitted by: KATO Tsuguru <tkato@prontomail.com>
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/mesa-demos/Makefile | 3 | ||||
| -rw-r--r-- | graphics/mesa-demos/files/patch-demos-Makefile | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/graphics/mesa-demos/Makefile b/graphics/mesa-demos/Makefile index 42fca8d98f27..fcf68b617dd5 100644 --- a/graphics/mesa-demos/Makefile +++ b/graphics/mesa-demos/Makefile @@ -7,6 +7,7 @@ PORTNAME= demos PORTVERSION= 5.0.2 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:S/$/:sf/} \ ${MASTER_SITE_LOCAL:S/$/:local/} @@ -23,6 +24,8 @@ LIB_DEPENDS= glut.3:${PORTSDIR}/graphics/libglut USE_BZIP2= yes USE_REINPLACE= yes +MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ + PTHREAD_LIBS="${PTHREAD_LIBS}" MAKEFILE= Makefile.X11 ALL_TARGET= targets WRKSRC= ${WRKDIR}/Mesa-${PORTVERSION}/demos diff --git a/graphics/mesa-demos/files/patch-demos-Makefile b/graphics/mesa-demos/files/patch-demos-Makefile index 52327335e027..6c3e48495d4b 100644 --- a/graphics/mesa-demos/files/patch-demos-Makefile +++ b/graphics/mesa-demos/files/patch-demos-Makefile @@ -5,13 +5,13 @@ LIBDIR = ../lib -GL_LIBS = -L$(LIBDIR) -lglut -lGLU -lGL $(APP_LIB_DEPS) -+GL_LIBS = -L$(X11BASE)/lib -lglut -lGLU -lGL $(APP_LIB_DEPS) ++GL_LIBS = -L$(X11BASE)/lib -lglut -lGLU -lGL $(APP_LIB_DEPS) ${PTHREAD_LIBS} -OSMESA_LIBS = -L$(LIBDIR) -lglut -lOSMesa -lGLU -lGL $(APP_LIB_DEPS) -+OSMESA_LIBS = -L$(X11BASE)/lib -lglut -lOSMesa -lGLU -lGL $(APP_LIB_DEPS) ++OSMESA_LIBS = -L$(X11BASE)/lib -lglut -lOSMesa -lGLU -lGL $(APP_LIB_DEPS) ${PTHREAD_LIBS} LIB_DEP = $(LIBDIR)/$(GL_LIB) $(LIBDIR)/$(GLU_LIB) $(LIBDIR)/$(GLUT_LIB) -+CFLAGS += -DGL_ARB_point_parameters=0 ++CFLAGS += -DGL_ARB_point_parameters=0 ${PTHREAD_CFLAGS} PROGS = bounce \ clearspd \ |