Fix build on 4.x.

This commit is contained in:
Alex Dupre
2006-11-13 07:24:25 +00:00
parent 43c8739441
commit 247ff4e341
3 changed files with 15 additions and 4 deletions

View File

@@ -26,7 +26,7 @@ NO_WRKSUBDIR= yes
USE_GMAKE= yes
MAKEFILE= makefile
ALL_TARGET= default FreeBSD shared
USE_GCC= 3.2+
USE_GCC= 3.3+
USE_LDCONFIG= yes
PORTDOCS= README
@@ -39,8 +39,8 @@ post-patch:
.else
@${REINPLACE_CMD} -e 's/%%CFLAGS%%/${CFLAGS}/' ${WRKSRC}/makefile
.endif
@${REINPLACE_CMD} -e 's/%%PTHREAD_CFLAGS%%/${PTHREAD_CFLAGS}/;s/%%PTHREAD_LIBS%%/${PTHREAD_LIBS}/' \
${WRKSRC}/makefile
@${REINPLACE_CMD} -e 's/%%PTHREAD_CFLAGS%%/${PTHREAD_CFLAGS}/' ${WRKSRC}/makefile
@${REINPLACE_CMD} -e 's/%%PTHREAD_LIBS%%/${PTHREAD_LIBS}/' ${WRKSRC}/tools/getlibs.sh
do-install:
${INSTALL_DATA} ${WRKSRC}/libcl.a ${WRKSRC}/libcl.so.${PORTVERSION}.0 \

View File

@@ -5,7 +5,7 @@
@./tools/buildasm.sh $(AS) $(OBJPATH)
make $(DEFINES) EXTRAOBJS="$(ASMOBJS)" CFLAGS="$(CFLAGS) -DUSE_ASM \
- -fomit-frame-pointer -O3 -pthread"
+ %%CFLAGS%% %%PTHREAD_CFLAGS%% %%PTHREAD_LIBS%%"
+ %%CFLAGS%% %%PTHREAD_CFLAGS%%"
NetBSD:
@./tools/buildasm.sh $(AS) $(OBJPATH)
make $(DEFINES) EXTRAOBJS="$(ASMOBJS)" CFLAGS="$(CFLAGS) -DUSE_ASM \

View File

@@ -0,0 +1,11 @@
--- tools/getlibs.sh.orig Mon Nov 13 08:18:56 2006
+++ tools/getlibs.sh Mon Nov 13 08:19:14 2006
@@ -92,7 +92,7 @@
echo "" ;;
'FreeBSD'|'NetBSD')
- echo "-lpthread" ;;
+ echo "%%PTHREAD_LIBS%%" ;;
'HP-UX')
case `uname -r | sed 's/^[A-Z].//' | cut -f 1 -d '.'` in