* Fix use of PTHREADS_* [1]

* Fix build [2]
* Respect CXXFLAGS (this port is broken with -O, so add -O0 to disable it)
* Fix and sort pkg-plist

Submitted by:   Dan Johansson <djodv97@student.vxu.se> [1],
		Miguel Mendez <flynn@energyhq.homeip.net> [2]
PR:             ports/41040
This commit is contained in:
Kris Kennaway 2002-09-21 01:29:46 +00:00
parent f62cfe5b6b
commit 24f27eb41e
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=66951
4 changed files with 812 additions and 739 deletions

View file

@ -13,8 +13,6 @@ DISTNAME= cs94_002
MAINTAINER= mkm@ieee.org
BROKEN= "Does not build"
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
png.5:${PORTSDIR}/graphics/png
@ -27,10 +25,9 @@ pre-build:
cd ${WRKSRC}; ${GMAKE} freebsd
pre-patch:
@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS:S/"//g}|' \
${WRKSRC}/plugins/cscript/cspython/cspython.mak
@${FIND} ${WRKSRC} -name "*.mak" | ${XARGS} ${PERL} -pi -e \
's|-O6|${PTHREAD_CFLAGS}|; s|/usr/local|${LOCALBASE}|; \
s|-lGL|-lGL ${PTHREAD_LIBS}|g; s|-lpthread|${PTHREAD_LIBS}|g; \
s|INSTALL_DIR = ${LOCALBASE}/crystal|INSTALL_DIR = ${PREFIX}/crystal|'
.include <bsd.port.mk>

View file

@ -0,0 +1,17 @@
--- ./libs/cssys/unix/freebsd.mak.orig Fri Sep 20 16:19:32 2002
+++ ./libs/cssys/unix/freebsd.mak Fri Sep 20 16:18:44 2002
@@ -72,11 +72,11 @@
CFLAGS.INCLUDE=$(CFLAGS.I)/usr/local/include
# General flags for the compiler which are used in any case.
-CFLAGS.GENERAL=-Wall
+CFLAGS.GENERAL=$(CXXFLAGS) -O0
# Flags for the compiler which are used when optimizing.
-CFLAGS.optimize=-D_THREAD_SAFE -fomit-frame-pointer -malign-loops=2 -malign-jumps=2 \
- -malign-functions=2 -ffast-math
+CFLAGS.optimize=-D_THREAD_SAFE -fomit-frame-pointer -falign-loops=2 -falign-jumps=2 \
+ -falign-functions=2 -ffast-math
# Flags for the compiler which are used when debugging.
CFLAGS.debug=-g3 -gstabs

View file

@ -0,0 +1,11 @@
--- mk/nasm.mak.orig Fri Sep 20 17:54:48 2002
+++ mk/nasm.mak Fri Sep 20 17:55:06 2002
@@ -18,7 +18,7 @@
NASM.BIN = nasm
# NASM flags (well, PROC= is not quite useful (for now?))
-NASMFLAGS = -DOS=$(OS) -DCOMP=$(COMP) -DPROC=$(PROC) $(NASMFLAGS.SYSTEM)
+NASMFLAGS = -DOS=$(OS) -DCOMP=$(COMP) -DPROC=$(PROC) -f elf
# If shared libraries use position-independent code, tell NASM about that
ifneq ($(substr pic,$(CFLAGS.DLL))$(substr PIC,$(CFLAGS.DLL)),)

File diff suppressed because it is too large Load diff