mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-19 19:59:43 +00:00
Code Issues Releases Activity

security/git-crypt: fix build with GCC-based architectures

Browse Source 
Add USES=compiler:c++11-lang.

Don't add -L${OPENSSLLIB} unconditionally, do it only when SSL library from ports is used. The reason is that adding -L/usr/lib makes ports GCC want to link to libstdc++ from /usr/lib, not from /usr/local/lib/gcc8. This causes linking errors

PR:		237525
Approved by:	ashish (maintainer), tcberner (mentor)
Differential Revision:	https://reviews.freebsd.org/D20053
This commit is contained in:
Piotr Kubaj 2019-04-27 08:41:58 +00:00
parent 464b23aacb
commit bdd980e301
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=500197
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
security/git-crypt/Makefile
View File

@ -18,8 +18,6 @@ RUN_DEPENDS= git:devel/git \
OPTIONS_DEFINE= MANPAGES
CXXFLAGS+= -I${OPENSSLINC}
LDFLAGS+= -L${OPENSSLLIB}
MAKE_ENV+= PREFIX=${PREFIX} "CXXFLAGS=${CXXFLAGS}" \
"LDFLAGS=${LDFLAGS}"
@ -30,10 +28,17 @@ MANPAGES_MAKE_ARGS= ENABLE_MAN=yes \
DOCBOOK_XSL=${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl
MANPAGES_PLIST_FILES= man/man1/${PORTNAME}.1.gz
USES= gmake ssl
USES= compiler:c++11-lang gmake ssl
PLIST_FILES= bin/${PORTNAME}
.include <bsd.port.pre.mk>
.if ${SSL_DEFAULT} != base
CXXFLAGS+= -I${OPENSSLINC}
LDFLAGS+= -L${OPENSSLLIB}
.endif
post-extract:
@${GREP} -Rl '"gpg"' ${WRKSRC} |${XARGS} ${REINPLACE_CMD} -e 's,"gpg","${LOCALBASE}/bin/gpg",'
@${GREP} -Rl '"git"' ${WRKSRC} |${XARGS} ${REINPLACE_CMD} -e 's,"git","${LOCALBASE}/bin/git",'
@ -41,4 +46,4 @@ post-extract:
post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/git-crypt
.include <bsd.port.mk>
.include <bsd.port.post.mk>