pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/devel/got-portable



Module Name:    pkgsrc
Committed By:   vins
Date:           Tue Jul 18 09:33:18 UTC 2023

Modified Files:
        pkgsrc/devel/got-portable: Makefile

Log Message:
devel/got-portable: fix building on Linux.

The compat <sha2.h> header provided by got-portable 0.85+ gets wrongly
included by libmd's <sha256.h>, leading to SHA2_CTX type redefinition.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/devel/got-portable/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/got-portable/Makefile
diff -u pkgsrc/devel/got-portable/Makefile:1.9 pkgsrc/devel/got-portable/Makefile:1.10
--- pkgsrc/devel/got-portable/Makefile:1.9      Thu Jul  6 15:18:36 2023
+++ pkgsrc/devel/got-portable/Makefile  Tue Jul 18 09:33:18 2023
@@ -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



Home | Main Index | Thread Index | Old Index