tech-pkg archive

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

Fix for bootstrapping on macOS



			Hi tech-pkg@,

I just tested bootstrapping pkgsrc on macOS with the pkgsrc-2020Q2 branch, plus the fix from schmonz@ for the latest version of Xcode. It failed with missing function declarations in libarchive.

The following change fixed it for me:

Index: files/lib/vulnerabilities-file.c
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/pkg_install/files/lib/vulnerabilities-file.c,v
retrieving revision 1.11
diff -p -u -r1.11 vulnerabilities-file.c
--- files/lib/vulnerabilities-file.c    21 Jul 2020 14:32:00 -0000      1.11
+++ files/lib/vulnerabilities-file.c    23 Sep 2020 17:58:10 -0000
@@ -46,9 +46,7 @@ __RCSID("$NetBSD: vulnerabilities-file.c
 #if HAVE_SYS_WAIT_H
 #include <sys/wait.h>
 #endif
-#ifndef BOOTSTRAP
 #include <archive.h>
-#endif
 #include <ctype.h>
 #if HAVE_ERR_H
 #include <err.h>

I just tried and saw that bootstrapping does work with -current on macOS, even without this patch.

Is it OK to commit this change in -current anyway, even though we are under freeze for pkgsrc-2020Q3?

This would fix the underlying problem in pkg_install, and allow us to fix it in pkgsrc-2020Q2. We are close to releasing pkgsrc-2020Q3 but in the meantime, we're still supporting the current stable branch.

Otherwise I can also wait for after the freeze.

Let me know,
--
khorben



Home | Main Index | Thread Index | Old Index