Tue Mar 12 22:00:13 2024 UTC (74d)
Don't bother building bsdcat during bootstrap.


(joerg)
diff -r1.321 -r1.322 pkgsrc/bootstrap/bootstrap
cvs diff -r1.321 -r1.322 pkgsrc/bootstrap/bootstrap (expand / switch to unified diff)

--- pkgsrc/bootstrap/bootstrap 2024/02/15 19:43:42 1.321
+++ pkgsrc/bootstrap/bootstrap 2024/03/12 22:00:13 1.322
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1#! /bin/sh 1#! /bin/sh
2 2
3# $NetBSD: bootstrap,v 1.321 2024/02/15 19:43:42 joerg Exp $ 3# $NetBSD: bootstrap,v 1.322 2024/03/12 22:00:13 joerg Exp $
4# 4#
5# Copyright (c) 2001-2011 Alistair Crooks <agc@NetBSD.org> 5# Copyright (c) 2001-2011 Alistair Crooks <agc@NetBSD.org>
6# All rights reserved. 6# All rights reserved.
7# 7#
8# Redistribution and use in source and binary forms, with or without 8# Redistribution and use in source and binary forms, with or without
9# modification, are permitted provided that the following conditions 9# modification, are permitted provided that the following conditions
10# are met: 10# are met:
11# 1. Redistributions of source code must retain the above copyright 11# 1. Redistributions of source code must retain the above copyright
12# notice, this list of conditions and the following disclaimer. 12# notice, this list of conditions and the following disclaimer.
13# 2. Redistributions in binary form must reproduce the above copyright 13# 2. Redistributions in binary form must reproduce the above copyright
14# notice, this list of conditions and the following disclaimer in the 14# notice, this list of conditions and the following disclaimer in the
15# documentation and/or other materials provided with the distribution. 15# documentation and/or other materials provided with the distribution.
16# 16#
@@ -1345,30 +1345,31 @@ yes) echo_msg "Bootstrapping sed" @@ -1345,30 +1345,31 @@ yes) echo_msg "Bootstrapping sed"
1345 fi 1345 fi
1346 ;; 1346 ;;
1347esac 1347esac
1348 1348
1349# bootstrap pkg_install 1349# bootstrap pkg_install
1350extra_libarchive_depends() { 1350extra_libarchive_depends() {
1351 $sedprog -n -e 's/Libs.private: //p' $wrkdir/libarchive/build/pkgconfig/libarchive.pc 1351 $sedprog -n -e 's/Libs.private: //p' $wrkdir/libarchive/build/pkgconfig/libarchive.pc
1352} 1352}
1353 1353
1354echo_msg "Bootstrapping pkgtools" 1354echo_msg "Bootstrapping pkgtools"
1355copy_src $pkgsrcdir/archivers/libarchive/files libarchive 1355copy_src $pkgsrcdir/archivers/libarchive/files libarchive
1356run_cmd "(cd $wrkdir/libarchive; env $BSTRAP_ENV CONFIG_SHELL=$shprog \ 1356run_cmd "(cd $wrkdir/libarchive; env $BSTRAP_ENV CONFIG_SHELL=$shprog \
1357$shprog ./configure $configure_quiet_flags --enable-static --disable-shared \ 1357$shprog ./configure $configure_quiet_flags --enable-static --disable-shared \
1358--disable-bsdtar --disable-bsdcpio --disable-bsdunzip --disable-posix-regex-lib \ 1358--disable-bsdcat --disable-bsdtar --disable-bsdcpio --disable-bsdunzip \
1359--disable-xattr --disable-maintainer-mode --disable-acl --without-zlib \ 1359--disable-posix-regex-lib --disable-xattr --disable-maintainer-mode \
1360--without-bz2lib --without-iconv --without-lzma --without-lzo2 --without-lz4 \ 1360--disable-acl --without-zlib --without-bz2lib --without-iconv --without-lzma \
1361--without-nettle --without-openssl --without-xml2 --without-expat --without-zstd \ 1361--without-lzo2 --without-lz4 --without-nettle --without-openssl \
 1362--without-xml2 --without-expat --without-zstd \
1362MAKE=$bmake && $bmake $make_quiet_flags -j$make_jobs)" 1363MAKE=$bmake && $bmake $make_quiet_flags -j$make_jobs)"
1363copy_src $pkgsrcdir/pkgtools/pkg_install/files pkg_install 1364copy_src $pkgsrcdir/pkgtools/pkg_install/files pkg_install
1364run_cmd "(cd $wrkdir/pkg_install; env $BSTRAP_ENV \ 1365run_cmd "(cd $wrkdir/pkg_install; env $BSTRAP_ENV \
1365CPPFLAGS='$CPPFLAGS -I${wrkdir}/libnbcompat -I${wrkdir}/libarchive/libarchive' \ 1366CPPFLAGS='$CPPFLAGS -I${wrkdir}/libnbcompat -I${wrkdir}/libarchive/libarchive' \
1366LDFLAGS='$LDFLAGS -L${wrkdir}/libnbcompat' \ 1367LDFLAGS='$LDFLAGS -L${wrkdir}/libnbcompat' \
1367LIBS='$LIBS -lnbcompat' $shprog ./configure $configure_quiet_flags -C \ 1368LIBS='$LIBS -lnbcompat' $shprog ./configure $configure_quiet_flags -C \
1368--enable-bootstrap --prefix=$prefix --sysconfdir=$sysconfdir \ 1369--enable-bootstrap --prefix=$prefix --sysconfdir=$sysconfdir \
1369--with-pkgdbdir=$pkgdbdir --infodir=$infodir \ 1370--with-pkgdbdir=$pkgdbdir --infodir=$infodir \
1370--mandir=$mandir $pkg_install_args && \ 1371--mandir=$mandir $pkg_install_args && \
1371STATIC_LIBARCHIVE=$wrkdir/libarchive/.libs/libarchive.a \ 1372STATIC_LIBARCHIVE=$wrkdir/libarchive/.libs/libarchive.a \
1372STATIC_LIBARCHIVE_LDADD='`extra_libarchive_depends`' \ 1373STATIC_LIBARCHIVE_LDADD='`extra_libarchive_depends`' \
1373PKGSRC_MACHINE_ARCH="$machine_arch" $bmake $make_quiet_flags -j$make_jobs)" 1374PKGSRC_MACHINE_ARCH="$machine_arch" $bmake $make_quiet_flags -j$make_jobs)"
1374run_cmd "$install_sh -c -o $user -g $group -m 755 $wrkdir/pkg_install/add/pkg_add $wrkdir/sbin/pkg_add" 1375run_cmd "$install_sh -c -o $user -g $group -m 755 $wrkdir/pkg_install/add/pkg_add $wrkdir/sbin/pkg_add"