Date: Fri, 10 Aug 2001 06:19:10 -0400 (EDT) From: pat@databits.net To: FreeBSD-gnats-submit@freebsd.org Subject: ports/29593: Fix linker problems in games/battalion (Bento) Message-ID: <200108101019.f7AAJAo52281@cc92687-a.wlgrv1.pa.home.com>
next in thread | raw e-mail | index | archive | help
>Number: 29593
>Category: ports
>Synopsis: Fix linker problems in games/battalion (Bento)
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri Aug 10 03:20:01 PDT 2001
>Closed-Date:
>Last-Modified:
>Originator: Patrick Li
>Release: FreeBSD 4.4-PRERELEASE i386
>Organization:
N/A
>Environment:
System: FreeBSD bottlenek 4.4-PRERELEASE FreeBSD 4.4-PRERELEASE #0: Sun Aug 5 00:29:13 EDT 2001 root@bottlenek:/usr/src/sys/compile/BOTTLENEK i386
>Description:
Fix linker problems noted by bento.
PR# 29313 exists from John Merryweather Cooper <jmcoopr@webmail.bmi.net>
that can be closed now. It is regarding a battalion fix for
bento like mine but his made unnecessary changes and renaming of patches
that made the patch bigger and also it was not ptheads safe.
this one uses variables ${PTHREAD_[LIBS,CFLAGS]} not hard coded -pthreads.
>How-To-Repeat:
N/A
>Fix:
diff -ruN /usr/ports/games/battalion/Makefile battalion/Makefile
--- /usr/ports/games/battalion/Makefile Thu Aug 3 05:23:22 2000
+++ battalion/Makefile Fri Aug 10 00:56:08 2001
@@ -17,6 +17,8 @@
USE_X_PREFIX= yes
USE_MESA= yes
WRKSRC= ${WRKDIR}/battalionSource
+MAKE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}" \
+ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"
MAN6= battalion.6
diff -ruN /usr/ports/games/battalion/files/patch-aa battalion/files/patch-aa
--- /usr/ports/games/battalion/files/patch-aa Sat Apr 1 19:57:01 2000
+++ battalion/files/patch-aa Fri Aug 10 00:55:32 2001
@@ -1,5 +1,5 @@
---- Makefile.orig Thu Jan 16 16:31:58 1997
-+++ Makefile Wed Mar 29 13:08:11 1998
+--- Makefile.orig Thu Jan 16 11:31:58 1997
++++ Makefile Fri Aug 10 00:51:07 2001
@@ -23,7 +23,7 @@
# (the program should compile with no warning messages - if you
# see a warning message please let me know about it)
@@ -46,7 +46,7 @@
# STEP 7: CHOOSE ANY OPTIMIZATIONS OR ADD ANY SPECIAL INCLUSIONS
# ------------------------------------------------------------
-CFLAGS = -O -I/usr/local/X11/include -I/usr/demo/SOUND/ -I./.
-+CFLAGS+= -I${X11BASE}/include -DPREFIX=\"${PREFIX}\"
++CFLAGS+= -I${X11BASE}/include -DPREFIX=\"${PREFIX}\" ${PTHREAD_CFLAGS}
# STEP 8: ADD ANY SPECIAL LIBRARY PATHS
@@ -55,7 +55,7 @@
OBJ = battalion.o audio.o net.o gprim.o graphics.o objects.o text.o update.o tk.o font.o
-LIBS = -L./. -L/usr/X11R6/lib -lm -lX11 -lXext
-+LIBS = -L./. -L${X11BASE}/lib -lm -lX11 -lXext -lcompat
++LIBS = -L./. -L${X11BASE}/lib -lm -lX11 -lXext -lcompat ${PTHREAD_LIBS}
all: $(TARGET)
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200108101019.f7AAJAo52281>