CVS commit: pkgsrc

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Wed Oct 28 16:52:43 UTC 2020

Modified Files:
        pkgsrc/bootstrap: bootstrap
        pkgsrc/pkgtools/pkg_install/files/add: Makefile.in
        pkgsrc/pkgtools/pkg_install/files/create: Makefile.in

Log Message:
Bootstrap: Fix bootstrap on FreeBSD 12.1, likely broken by an issue in lld.

It looks like lld doesn't want to statically link a libarchive without
resolving all of the symbols, even if only a few symbols are used.

In order to resolve all of the symbols, we need to also link with -lmd.
One generic way to do so is inspect Libs.private in the pkgconfig file.

While pkgsrc is likely not at fault here, having a dysfunctional bootstrap
is bad. We should check again in the future to see if this can be removed.

Actually fixes PR pkg/55400.


To generate a diff of this commit:
cvs rdiff -u -r1.294 -r1.295 pkgsrc/bootstrap/bootstrap
cvs rdiff -u -r1.33 -r1.34 pkgsrc/pkgtools/pkg_install/files/add/Makefile.in
cvs rdiff -u -r1.29 -r1.30 \
    pkgsrc/pkgtools/pkg_install/files/create/Makefile.in

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

Modified files:

Index: pkgsrc/bootstrap/bootstrap
diff -u pkgsrc/bootstrap/bootstrap:1.294 pkgsrc/bootstrap/bootstrap:1.295
--- pkgsrc/bootstrap/bootstrap:1.294    Wed Oct  7 10:44:14 2020
+++ pkgsrc/bootstrap/bootstrap  Wed Oct 28 16:52:43 2020
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: bootstrap,v 1.294 2020/10/07 10:44:14 jperkin Exp $
+# $NetBSD: bootstrap,v 1.295 2020/10/28 16:52:43 maya Exp $
 #
 # Copyright (c) 2001-2011 Alistair Crooks <agc%NetBSD.org@localhost>
 # All rights reserved.
@@ -1235,6 +1235,10 @@ yes)     echo_msg "Bootstrapping sed"
 esac
 
 # bootstrap pkg_install
+extra_libarchive_depends() {
+       $sedprog -n -e 's/Libs.private: //p' $wrkdir/libarchive/build/pkgconfig/libarchive.pc
+}
+
 echo_msg "Bootstrapping pkgtools"
 copy_src $pkgsrcdir/archivers/libarchive/files libarchive
 run_cmd "(cd $wrkdir/libarchive; env $BSTRAP_ENV \
@@ -1253,6 +1257,7 @@ LIBS='$LIBS -lnbcompat' $shprog ./config
 --with-pkgdbdir=$pkgdbdir --infodir=$infodir \
 --mandir=$mandir $pkg_install_args && \
 STATIC_LIBARCHIVE=$wrkdir/libarchive/.libs/libarchive.a \
+STATIC_LIBARCHIVE_LDADD=`extra_libarchive_depends` \
 PKGSRC_MACHINE_ARCH="$machine_arch" $bmake $make_quiet_flags -j$make_jobs)"
 run_cmd "$install_sh -c -o $user -g $group -m 755 $wrkdir/pkg_install/add/pkg_add $wrkdir/sbin/pkg_add"
 run_cmd "$install_sh -c -o $user -g $group -m 755 $wrkdir/pkg_install/admin/pkg_admin $wrkdir/sbin/pkg_admin"

Index: pkgsrc/pkgtools/pkg_install/files/add/Makefile.in
diff -u pkgsrc/pkgtools/pkg_install/files/add/Makefile.in:1.33 pkgsrc/pkgtools/pkg_install/files/add/Makefile.in:1.34
--- pkgsrc/pkgtools/pkg_install/files/add/Makefile.in:1.33      Sun Dec 27 12:36:42 2015
+++ pkgsrc/pkgtools/pkg_install/files/add/Makefile.in   Wed Oct 28 16:52:43 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.in,v 1.33 2015/12/27 12:36:42 joerg Exp $
+# $NetBSD: Makefile.in,v 1.34 2020/10/28 16:52:43 maya Exp $
 
 srcdir=                @srcdir@
 
@@ -29,7 +29,7 @@ CPPFLAGS+=    -DHAVE_SSL
 .endif
 LIBS+=         @LIBS@
 .else
-LIBS=          -linstall ${STATIC_LIBARCHIVE} @LIBS@
+LIBS=          -linstall ${STATIC_LIBARCHIVE} ${STATIC_LIBARCHIVE_LDADD} @LIBS@
 CPPFLAGS+=     -DBOOTSTRAP
 .endif
 

Index: pkgsrc/pkgtools/pkg_install/files/create/Makefile.in
diff -u pkgsrc/pkgtools/pkg_install/files/create/Makefile.in:1.29 pkgsrc/pkgtools/pkg_install/files/create/Makefile.in:1.30
--- pkgsrc/pkgtools/pkg_install/files/create/Makefile.in:1.29   Sun Dec 27 12:36:42 2015
+++ pkgsrc/pkgtools/pkg_install/files/create/Makefile.in        Wed Oct 28 16:52:43 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.in,v 1.29 2015/12/27 12:36:42 joerg Exp $
+# $NetBSD: Makefile.in,v 1.30 2020/10/28 16:52:43 maya Exp $
 
 srcdir=                @srcdir@
 
@@ -33,7 +33,7 @@ LIBS=         -linstall -lnetpgpverify -larchiv
 LIBS+=         -lssl -lcrypto
 .endif
 .else
-LIBS=          -linstall ${STATIC_LIBARCHIVE} @LIBS@
+LIBS=          -linstall ${STATIC_LIBARCHIVE} ${STATIC_LIBARCHIVE_LDADD} @LIBS@
 CPPFLAGS+=     -DBOOTSTRAP
 .endif