From 9860b2af022eb9374eb1c2ff325b545cbda564c5 Mon Sep 17 00:00:00 2001 From: vins Date: Tue, 18 Jul 2023 09:33:18 +0000 Subject: [PATCH] devel/got-portable: fix building on Linux. The compat header provided by got-portable 0.85+ gets wrongly included by libmd's , leading to SHA2_CTX type redefinition. --- devel/got-portable/Makefile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/devel/got-portable/Makefile b/devel/got-portable/Makefile index 3d6d647b5cc1..bbf5ead8da20 100644 --- a/devel/got-portable/Makefile +++ b/devel/got-portable/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2023/07/06 15:18:36 vins Exp $ +# $NetBSD: Makefile,v 1.10 2023/07/18 09:33:18 vins Exp $ DISTNAME= got-portable-0.90 PKGREVISION= 2 @@ -18,6 +18,8 @@ ONLY_FOR_PLATFORM+= Linux-*-* ONLY_FOR_PLATFORM+= FreeBSD-*-* ONLY_FOR_PLATFORM+= DragonFly-*-* +LDFLAGS+= -lmd -lbsd + USE_TOOLS+= pkg-config yacc .include "../../mk/bsd.prefs.mk" @@ -32,7 +34,9 @@ INSTALLATION_DIRS= bin libexec INSTALLATION_DIRS+= ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 .if ${OPSYS} == "Linux" -USE_TOOLS+= bison +post-patch: +# let libmd include the correct header. + ${RM} -f ${WRKSRC}/compat/sha2.h # compatibility macros and functions for Linux. . include "../../devel/libbsd/buildlink3.mk" .endif