diff options
| author | sjmulder <sjmulder@pkgsrc.org> | 2020-07-21 14:32:00 +0000 |
|---|---|---|
| committer | sjmulder <sjmulder@pkgsrc.org> | 2020-07-21 14:32:00 +0000 |
| commit | 79a52430717031bb982c19f6ade34976cae3528b (patch) | |
| tree | f10c5dee1eb0e31ef8bc3c76f0a50ea8cd038366 | |
| parent | 2d6de11d907417c04c654b8807d318a13eefb080 (diff) | |
| download | pkgsrc-79a52430717031bb982c19f6ade34976cae3528b.tar.gz | |
pkg_install: BOOTSTRAP guard on libarchive-using function
Initial bootstrap builds of pkg_install don't use libarchive. Guarding
this function (as other places are) with #ifndef BOOTSTRAP prevents
'implicit declaration of archive_...()' warnings on FreeBSD 12 and Xcode
beta, which due to -Werror broke the bootstrap.
| -rw-r--r-- | pkgtools/pkg_install/files/lib/vulnerabilities-file.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgtools/pkg_install/files/lib/vulnerabilities-file.c b/pkgtools/pkg_install/files/lib/vulnerabilities-file.c index 8991e4eb0dc..e9635dedcdd 100644 --- a/pkgtools/pkg_install/files/lib/vulnerabilities-file.c +++ b/pkgtools/pkg_install/files/lib/vulnerabilities-file.c @@ -1,4 +1,4 @@ -/* $NetBSD: vulnerabilities-file.c,v 1.10 2018/02/26 23:45:02 ginsbach Exp $ */ +/* $NetBSD: vulnerabilities-file.c,v 1.11 2020/07/21 14:32:00 sjmulder Exp $ */ /*- * Copyright (c) 2008, 2010 Joerg Sonnenberger <joerg@NetBSD.org>. @@ -38,7 +38,7 @@ #if HAVE_SYS_CDEFS_H #include <sys/cdefs.h> #endif -__RCSID("$NetBSD: vulnerabilities-file.c,v 1.10 2018/02/26 23:45:02 ginsbach Exp $"); +__RCSID("$NetBSD: vulnerabilities-file.c,v 1.11 2020/07/21 14:32:00 sjmulder Exp $"); #if HAVE_SYS_STAT_H #include <sys/stat.h> @@ -77,6 +77,7 @@ static const char pgp_msg_end[] = "-----BEGIN PGP SIGNATURE-----\n"; static const char pkcs7_begin[] = "-----BEGIN PKCS7-----\n"; static const char pkcs7_end[] = "-----END PKCS7-----\n"; +#ifndef BOOTSTRAP static struct archive * prepare_raw_file(void) { @@ -90,6 +91,7 @@ prepare_raw_file(void) archive_read_support_format_raw(a); return a; } +#endif static void verify_signature_pkcs7(const char *input) |