[pkgsrc/trunk]: pkgsrc/pkgtools/pkg_install/files/lib pkg_install: BOOTSTRAP ...

[sjmulder <sjmulder%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/21f0f84d4963
branches:  trunk
changeset: 435959:21f0f84d4963
user:      sjmulder <sjmulder%pkgsrc.org@localhost>
date:      Tue Jul 21 14:32:00 2020 +0000

description:
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.

diffstat:

 pkgtools/pkg_install/files/lib/vulnerabilities-file.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (34 lines):

diff -r ce52a1b355ef -r 21f0f84d4963 pkgtools/pkg_install/files/lib/vulnerabilities-file.c
--- a/pkgtools/pkg_install/files/lib/vulnerabilities-file.c     Tue Jul 21 10:59:29 2020 +0000
+++ b/pkgtools/pkg_install/files/lib/vulnerabilities-file.c     Tue Jul 21 14:32:00 2020 +0000
@@ -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@localhost>.
@@ -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 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 @@
        archive_read_support_format_raw(a);
        return a;
 }
+#endif
 
 static void
 verify_signature_pkcs7(const char *input)