Re: install/54844: ``build.sh install-image'' fails with -V USE_PIGZGZIP=yes

[Paul Goyette <paul%whooppee.com@localhost>]

The following reply was made to PR install/54844; it has been noted by GNATS.

From: Paul Goyette <paul%whooppee.com@localhost>
To: gnats-bugs%netbsd.org@localhost
Cc: 
Subject: Re: install/54844: ``build.sh install-image'' fails with -V
 USE_PIGZGZIP=yes
Date: Tue, 19 Apr 2022 14:35:32 -0700 (PDT)

 The following patches provided by tnn@ will enable posxi-thread mode
 when building TOOL_XZ.  The final patch adds the ``-T0'' option when
 invoking TOOL_XZ to build the distribution sets.  Together, these
 changes reduce my time-to-build from 2 hours to 90 minutes, a 25%
 reduction.
 
 It would be nice if someone with more make-foo than I could get
 this a bit prettier and controllable with a USE_XZ_TOOL_THREADS
 knob (or similar).
 
 
 Index: external/public-domain/xz/bin/xz/Makefile
 ===================================================================
 RCS file: /cvsroot/src/external/public-domain/xz/bin/xz/Makefile,v
 retrieving revision 1.6
 diff -p -u -r1.6 Makefile
 --- external/public-domain/xz/bin/xz/Makefile   12 Apr 2021 02:54:08 -0000 1.6
 +++ external/public-domain/xz/bin/xz/Makefile   19 Apr 2022 18:03:58 -0000
 @@ -44,7 +44,7 @@ FILESNAME_${XZSRCDIR}/po/${lang}.gmo= xz
   .if defined(HOSTPROG)
   HOST_CPPFLAGS+=	${CPPFLAGS:N-Wp,-iremap,*}
   XZLIBDIR!=	cd ${NETBSDSRCDIR}/tools/xz-lib && ${PRINTOBJDIR}
 -LDADD+=	-L${XZLIBDIR} -llzma
 +LDADD+=	-L${XZLIBDIR} -llzma -lpthread
   DPADD+=	${XZLIBDIR}/liblzma.a
   .else
   DPADD+=	${LIBLZMA} ${LIBINTL} ${LIBPTHREAD}
 Index: external/public-domain/xz/lib/Makefile
 ===================================================================
 RCS file: /cvsroot/src/external/public-domain/xz/lib/Makefile,v
 retrieving revision 1.10
 diff -p -u -r1.10 Makefile
 --- external/public-domain/xz/lib/Makefile      25 Sep 2018 05:42:08 -0000 1.10
 +++ external/public-domain/xz/lib/Makefile      19 Apr 2022 18:03:58 -0000
 @@ -57,9 +57,7 @@ SRCS+=        common.c block_util.c easy_preset
   	index_decoder.c index_hash.c stream_buffer_decoder.c \
   	stream_decoder.c stream_flags_decoder.c vli_decoder.c
 
 -.if !defined(HOSTLIB)
   SRCS+=	stream_encoder_mt.c
 -.endif
 
   .PATH: ${XZSRCDIR}/src/liblzma/delta
   SRCS+= delta_common.c delta_encoder.c delta_decoder.c
 Index: tools/xz-include/Makefile
 ===================================================================
 RCS file: /cvsroot/src/tools/xz-include/Makefile,v
 retrieving revision 1.4
 diff -p -u -r1.4 Makefile
 --- tools/xz-include/Makefile   18 Sep 2021 01:47:11 -0000      1.4
 +++ tools/xz-include/Makefile   19 Apr 2022 18:03:59 -0000
 @@ -8,7 +8,7 @@
   #
   .include "Makefile.inc"
 
 -CONFIGURE_ARGS+=	--enable-threads=no --disable-nls
 +CONFIGURE_ARGS+=	--enable-threads=posix --disable-nls
   .if ${MAKEVERBOSE} == 0
   CONFIGURE_ARGS+=	--silent
   .endif
 Index: distrib/sets/Makefile
 ===================================================================
 RCS file: /cvsroot/src/distrib/sets/Makefile,v
 retrieving revision 1.107
 diff -u -p -r1.107 Makefile
 --- Makefile    10 Mar 2019 11:04:08 -0000      1.107
 +++ Makefile    19 Apr 2022 21:28:32 -0000
 @@ -18,6 +18,7 @@ all:
   COMPRESS_PROGRAM=${"${USE_XZ_SETS:Uno}"!="no":?${TOOL_XZ}:${TOOL_GZIP}}
   TAR_SUFF=${"${USE_XZ_SETS:Uno}"!="no":?tar.xz:tgz}
   XZ_OPT= 	-9
 +XZ_OPT+= 	-T0
   GZIP_FLAGS=	${GZIP_N_FLAG}
 
   SETSENV=	DESTDIR=${DESTDIR:Q} \
 
 
 
 +--------------------+--------------------------+----------------------+
 | Paul Goyette       | PGP Key fingerprint:     | E-mail addresses:    |
 | (Retired)          | FA29 0E3B 35AF E8AE 6651 | paul%whooppee.com@localhost    |
 | Software Developer | 0786 F758 55DE 53BA 7731 | pgoyette%netbsd.org@localhost  |
 | & Network Engineer |                          | pgoyette99%gmail.com@localhost |
 +--------------------+--------------------------+----------------------+