diff options
| author | Steve Price <steve@FreeBSD.org> | 2001-06-17 18:19:53 +0000 |
|---|---|---|
| committer | Steve Price <steve@FreeBSD.org> | 2001-06-17 18:19:53 +0000 |
| commit | 380620cd4b541761aadc944a85a7c1baad141142 (patch) | |
| tree | 90a0c6f5f14fa615d2803a67c25afcc76cbe632d /x11-clocks | |
| parent | Fix distinfo missed in commit of ports/27974. (diff) | |
Add ${PTHREAD_LIBS} and ${PTHREAD_CFLAGS} to fix compile errors
PR: 28073
Submitted by: Patrick Li <pat@databits.net>
Notes
Notes:
svn path=/head/; revision=44126
Diffstat (limited to 'x11-clocks')
| -rw-r--r-- | x11-clocks/glclock/Makefile | 2 | ||||
| -rw-r--r-- | x11-clocks/glclock/files/patch-aa | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/x11-clocks/glclock/Makefile b/x11-clocks/glclock/Makefile index 65da8c80c1cd..ee4f22588dc1 100644 --- a/x11-clocks/glclock/Makefile +++ b/x11-clocks/glclock/Makefile @@ -7,6 +7,7 @@ PORTNAME= glclock PORTVERSION= 5.0 +PORTREVISION= 1 CATEGORIES= x11-clocks MASTER_SITES= http://www.daionet.gr.jp/~masa/archives/ \ http://hp.vector.co.jp/authors/VA013133/archives/ \ @@ -18,6 +19,7 @@ USE_X_PREFIX= yes USE_MESA= yes MAKEFILE= makefile ALL_TARGET= glclock +MAKE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}" SCRIPTS = benchclock crystalclock f_crystalclock f_glclock \ f_marbleclock f_metalclock f_mwclock f_woodclock marbleclock \ diff --git a/x11-clocks/glclock/files/patch-aa b/x11-clocks/glclock/files/patch-aa index 7ad697b8e23f..5add68e10d01 100644 --- a/x11-clocks/glclock/files/patch-aa +++ b/x11-clocks/glclock/files/patch-aa @@ -18,17 +18,17 @@ - LIBS = -lglut -lGLU -lGL -lXext -lXmu -lX11 -lm + INCLUDE_PATH = -I${X11BASE}/include -+ LIB_PATH = -L${X11BASE}/lib -Wl,-rpath,/usr/X11R6/lib ++ LIB_PATH = -L${X11BASE}/lib -Wl,-rpath,/usr/X11R6/lib + +# Link with -lGL on FreeBSD so we use hardware-accelerated GL, when installed. +# (see http://people.FreeBSD.org/~3d) -+ LIBS = -lglut -lGLU -lGL -lXext -lXmu -lX11 -lm -lXi ++ LIBS = -lglut -lGLU -lGL -lXext -lXmu -lX11 -lm -lXi ${PTHREAD_LIBS} # for Mesa # LIBS = -lglut -lMesatk -lMesaGLU -lMesaGL -lXi -lXext -lXmu -lX11 -lm - CFLAGS = -c -+ CFLAGS += -w -DGLCLOCK_DIR=\"${GLCLOCK_DIR}\" ++ CFLAGS += -w -DGLCLOCK_DIR=\"${GLCLOCK_DIR}\" ${PTHREAD_CFLAGS} LFLAGS = -COMPILE = $(CC) $(CFLAGS) $(OPT) $(INCLUDE_PATH) |