diff options
| author | Alex Dupre <ale@FreeBSD.org> | 2006-11-13 07:24:25 +0000 |
|---|---|---|
| committer | Alex Dupre <ale@FreeBSD.org> | 2006-11-13 07:24:25 +0000 |
| commit | 247ff4e34172093aef54a466ec8880a20787ac3a (patch) | |
| tree | 9f7abb7228d47ee5ebf1a41914a02542bea22c33 | |
| parent | Disconnect openoffice.org-2-RC from the INDEX build as it is breaking it: (diff) | |
Fix build on 4.x.
Notes
Notes:
svn path=/head/; revision=177160
| -rw-r--r-- | security/cryptlib/Makefile | 6 | ||||
| -rw-r--r-- | security/cryptlib/files/patch-makefile | 2 | ||||
| -rw-r--r-- | security/cryptlib/files/patch-tools_getlibs.sh | 11 |
3 files changed, 15 insertions, 4 deletions
diff --git a/security/cryptlib/Makefile b/security/cryptlib/Makefile index 727411058ba2..cdb0a0cb9253 100644 --- a/security/cryptlib/Makefile +++ b/security/cryptlib/Makefile @@ -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 \ diff --git a/security/cryptlib/files/patch-makefile b/security/cryptlib/files/patch-makefile index 1838beb283d7..77e5ac4b40ec 100644 --- a/security/cryptlib/files/patch-makefile +++ b/security/cryptlib/files/patch-makefile @@ -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 \ diff --git a/security/cryptlib/files/patch-tools_getlibs.sh b/security/cryptlib/files/patch-tools_getlibs.sh new file mode 100644 index 000000000000..47154339a0f8 --- /dev/null +++ b/security/cryptlib/files/patch-tools_getlibs.sh @@ -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 |