cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add ${PTHREAD_LIBS} and ${PTHREAD_CFLAGS} to fix compile errors

Browse Source 
PR:		28073
Submitted by:	Patrick Li <pat@databits.net>
This commit is contained in:
Steve Price 2001-06-17 18:19:53 +00:00
parent 27dd34c44b
commit 380620cd4b
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=44126
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
x11-clocks/glclock/Makefile
View File

@ -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 \

6
x11-clocks/glclock/files/patch-aa
View File

@ -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)