Diff of the two buildlogs:

--
--- b1/build.log	2025-01-21 02:19:42.108053082 +0000
+++ b2/build.log	2025-01-21 02:22:31.812409160 +0000
@@ -1,6 +1,6 @@
 I: pbuilder: network access will be disabled during build
-I: Current time: Sun Feb 22 20:41:18 -12 2026
-I: pbuilder-time-stamp: 1771836078
+I: Current time: Tue Jan 21 16:19:44 +14 2025
+I: pbuilder-time-stamp: 1737425984
 I: Building the build Environment
 I: extracting base tarball [/var/cache/pbuilder/unstable-reproducible-base.tgz]
 I: copying local configuration
@@ -26,54 +26,86 @@
 dpkg-source: info: applying 32b5167940ec817e454431956040734af405a9de.patch
 I: using fakeroot in build.
 I: Installing the build-deps
-I: user script /srv/workspace/pbuilder/74722/tmp/hooks/D02_print_environment starting
+I: user script /srv/workspace/pbuilder/32809/tmp/hooks/D01_modify_environment starting
+debug: Running on ionos12-i386.
+I: Changing host+domainname to test build reproducibility
+I: Adding a custom variable just for the fun of it...
+I: Changing /bin/sh to bash
+'/bin/sh' -> '/bin/bash'
+lrwxrwxrwx 1 root root 9 Jan 21 02:19 /bin/sh -> /bin/bash
+I: Setting pbuilder2's login shell to /bin/bash
+I: Setting pbuilder2's GECOS to second user,second room,second work-phone,second home-phone,second other
+I: user script /srv/workspace/pbuilder/32809/tmp/hooks/D01_modify_environment finished
+I: user script /srv/workspace/pbuilder/32809/tmp/hooks/D02_print_environment starting
 I: set
-  BUILDDIR='/build/reproducible-path'
-  BUILDUSERGECOS='first user,first room,first work-phone,first home-phone,first other'
-  BUILDUSERNAME='pbuilder1'
-  BUILD_ARCH='i386'
-  DEBIAN_FRONTEND='noninteractive'
-  DEB_BUILD_OPTIONS='buildinfo=+all reproducible=+all parallel=22 '
-  DISTRIBUTION='unstable'
-  HOME='/root'
-  HOST_ARCH='i386'
+  BASH=/bin/sh
+  BASHOPTS=checkwinsize:cmdhist:complete_fullquote:extquote:force_fignore:globasciiranges:globskipdots:hostcomplete:interactive_comments:patsub_replacement:progcomp:promptvars:sourcepath
+  BASH_ALIASES=()
+  BASH_ARGC=()
+  BASH_ARGV=()
+  BASH_CMDS=()
+  BASH_LINENO=([0]="12" [1]="0")
+  BASH_LOADABLES_PATH=/usr/local/lib/bash:/usr/lib/bash:/opt/local/lib/bash:/usr/pkg/lib/bash:/opt/pkg/lib/bash:.
+  BASH_SOURCE=([0]="/tmp/hooks/D02_print_environment" [1]="/tmp/hooks/D02_print_environment")
+  BASH_VERSINFO=([0]="5" [1]="2" [2]="37" [3]="1" [4]="release" [5]="i686-pc-linux-gnu")
+  BASH_VERSION='5.2.37(1)-release'
+  BUILDDIR=/build/reproducible-path
+  BUILDUSERGECOS='second user,second room,second work-phone,second home-phone,second other'
+  BUILDUSERNAME=pbuilder2
+  BUILD_ARCH=i386
+  DEBIAN_FRONTEND=noninteractive
+  DEB_BUILD_OPTIONS='buildinfo=+all reproducible=+all parallel=10 '
+  DIRSTACK=()
+  DISTRIBUTION=unstable
+  EUID=0
+  FUNCNAME=([0]="Echo" [1]="main")
+  GROUPS=()
+  HOME=/root
+  HOSTNAME=i-capture-the-hostname
+  HOSTTYPE=i686
+  HOST_ARCH=i386
   IFS=' 	
   '
-  INVOCATION_ID='4d231314822947c7bb3e4f3a731e9578'
-  LANG='C'
-  LANGUAGE='en_US:en'
-  LC_ALL='C'
-  LD_LIBRARY_PATH='/usr/lib/libeatmydata'
-  LD_PRELOAD='libeatmydata.so'
-  MAIL='/var/mail/root'
-  OPTIND='1'
-  PATH='/usr/sbin:/usr/bin:/sbin:/bin:/usr/games'
-  PBCURRENTCOMMANDLINEOPERATION='build'
-  PBUILDER_OPERATION='build'
-  PBUILDER_PKGDATADIR='/usr/share/pbuilder'
-  PBUILDER_PKGLIBDIR='/usr/lib/pbuilder'
-  PBUILDER_SYSCONFDIR='/etc'
-  PPID='74722'
-  PS1='# '
-  PS2='> '
+  INVOCATION_ID=528c744d31014bf8a23c0fbd423447d6
+  LANG=C
+  LANGUAGE=de_CH:de
+  LC_ALL=C
+  LD_LIBRARY_PATH=/usr/lib/libeatmydata
+  LD_PRELOAD=libeatmydata.so
+  MACHTYPE=i686-pc-linux-gnu
+  MAIL=/var/mail/root
+  OPTERR=1
+  OPTIND=1
+  OSTYPE=linux-gnu
+  PATH=/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path
+  PBCURRENTCOMMANDLINEOPERATION=build
+  PBUILDER_OPERATION=build
+  PBUILDER_PKGDATADIR=/usr/share/pbuilder
+  PBUILDER_PKGLIBDIR=/usr/lib/pbuilder
+  PBUILDER_SYSCONFDIR=/etc
+  PIPESTATUS=([0]="0")
+  POSIXLY_CORRECT=y
+  PPID=32809
   PS4='+ '
-  PWD='/'
-  SHELL='/bin/bash'
-  SHLVL='2'
-  SUDO_COMMAND='/usr/bin/timeout -k 18.1h 18h /usr/bin/ionice -c 3 /usr/bin/nice /usr/sbin/pbuilder --build --configfile /srv/reproducible-results/rbuild-debian/r-b-build.BRxgC78T/pbuilderrc_lZe2 --distribution unstable --hookdir /etc/pbuilder/first-build-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/unstable-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/r-b-build.BRxgC78T/b1 --logfile b1/build.log lbzip2_2.5-4.dsc'
-  SUDO_GID='112'
-  SUDO_UID='107'
-  SUDO_USER='jenkins'
-  TERM='unknown'
-  TZ='/usr/share/zoneinfo/Etc/GMT+12'
-  USER='root'
-  _='/usr/bin/systemd-run'
-  http_proxy='http://213.165.73.152:3128'
+  PWD=/
+  SHELL=/bin/bash
+  SHELLOPTS=braceexpand:errexit:hashall:interactive-comments:posix
+  SHLVL=3
+  SUDO_COMMAND='/usr/bin/timeout -k 24.1h 24h /usr/bin/ionice -c 3 /usr/bin/nice -n 11 /usr/bin/unshare --uts -- /usr/sbin/pbuilder --build --configfile /srv/reproducible-results/rbuild-debian/r-b-build.BRxgC78T/pbuilderrc_3fkk --distribution unstable --hookdir /etc/pbuilder/rebuild-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/unstable-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/r-b-build.BRxgC78T/b2 --logfile b2/build.log lbzip2_2.5-4.dsc'
+  SUDO_GID=112
+  SUDO_UID=107
+  SUDO_USER=jenkins
+  TERM=unknown
+  TZ=/usr/share/zoneinfo/Etc/GMT-14
+  UID=0
+  USER=root
+  _='I: set'
+  http_proxy=http://46.16.76.132:3128
 I: uname -a
-  Linux ionos16-i386 6.1.0-30-amd64 #1 SMP PREEMPT_DYNAMIC Debian 6.1.124-1 (2025-01-12) x86_64 GNU/Linux
+  Linux i-capture-the-hostname 6.1.0-30-amd64 #1 SMP PREEMPT_DYNAMIC Debian 6.1.124-1 (2025-01-12) x86_64 GNU/Linux
 I: ls -l /bin
-  lrwxrwxrwx 1 root root 7 Nov 22  2024 /bin -> usr/bin
-I: user script /srv/workspace/pbuilder/74722/tmp/hooks/D02_print_environment finished
+  lrwxrwxrwx 1 root root 7 Nov 22 14:40 /bin -> usr/bin
+I: user script /srv/workspace/pbuilder/32809/tmp/hooks/D02_print_environment finished
  -> Attempting to satisfy build-dependencies
  -> Creating pbuilder-satisfydepends-dummy package
 Package: pbuilder-satisfydepends-dummy
@@ -142,7 +174,7 @@
 Get: 29 http://deb.debian.org/debian unstable/main i386 po-debconf all 1.0.21+nmu1 [248 kB]
 Get: 30 http://deb.debian.org/debian unstable/main i386 debhelper all 13.24.1 [920 kB]
 Get: 31 http://deb.debian.org/debian unstable/main i386 gnulib all 20250102-1 [82.5 MB]
-Fetched 103 MB in 1s (107 MB/s)
+Fetched 103 MB in 2s (66.2 MB/s)
 Preconfiguring packages ...
 Selecting previously unselected package sensible-utils.
 (Reading database ... 
(Reading database ... 5%
(Reading database ... 10%
(Reading database ... 15%
(Reading database ... 20%
(Reading database ... 25%
(Reading database ... 30%
(Reading database ... 35%
(Reading database ... 40%
(Reading database ... 45%
(Reading database ... 50%
(Reading database ... 55%
(Reading database ... 60%
(Reading database ... 65%
(Reading database ... 70%
(Reading database ... 75%
(Reading database ... 80%
(Reading database ... 85%
(Reading database ... 90%
(Reading database ... 95%
(Reading database ... 100%
(Reading database ... 19837 files and directories currently installed.)
@@ -286,7 +318,11 @@
 fakeroot is already the newest version (1.36.2-1).
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
 I: Building the package
-I: Running cd /build/reproducible-path/lbzip2-2.5/ && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games" HOME="/nonexistent/first-build" dpkg-buildpackage -us -uc -b && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games" HOME="/nonexistent/first-build" dpkg-genchanges -S  > ../lbzip2_2.5-4_source.changes
+I: user script /srv/workspace/pbuilder/32809/tmp/hooks/A99_set_merged_usr starting
+Not re-configuring usrmerge for unstable
+I: user script /srv/workspace/pbuilder/32809/tmp/hooks/A99_set_merged_usr finished
+hostname: Name or service not known
+I: Running cd /build/reproducible-path/lbzip2-2.5/ && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path" HOME="/nonexistent/second-build" dpkg-buildpackage -us -uc -b && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path" HOME="/nonexistent/second-build" dpkg-genchanges -S  > ../lbzip2_2.5-4_source.changes
 dpkg-buildpackage: info: source package lbzip2
 dpkg-buildpackage: info: source version 2.5-4
 dpkg-buildpackage: info: source distribution unstable
@@ -1379,7 +1415,7 @@
 config.status: creating lib/config.h
 config.status: executing depfiles commands
    dh_auto_build
-	make -j22
+	make -j10
 make[1]: Entering directory '/build/reproducible-path/lbzip2-2.5'
 Making all in lib
 make[2]: Entering directory '/build/reproducible-path/lbzip2-2.5/lib'
@@ -1584,7 +1620,6 @@
       -e '/definition of _GL_ARG_NONNULL/r ./arg-nonnull.h' \
       -e '/definition of _GL_WARN_ON_USE/r ./warn-on-use.h' \
       ./signal.in.h > signal.h-t
-mv float.h-t float.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''INCLUDE_NEXT''@|include_next|g' \
@@ -1596,8 +1631,8 @@
       -e 's|@''REPLACE_NULL''@|0|g' \
       -e 's|@''HAVE_MAX_ALIGN_T''@|1|g' \
       ./stddef.in.h > stddef.h-t
-mv fcntl.h-t fcntl.h
 mv limits.h-t limits.h
+mv float.h-t float.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''INCLUDE_NEXT''@|include_next|g' \
@@ -1737,8 +1772,7 @@
       -e 's/@''GNULIB_MDA_MKTEMP''@/1/g' \
       -e 's/@''GNULIB_MDA_PUTENV''@/1/g' \
       < ./stdlib.in.h > stdlib.h-t1
-mv sched.h-t sched.h
-mv stddef.h-t stddef.h
+mv fcntl.h-t fcntl.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''INCLUDE_NEXT''@|include_next|g' \
@@ -1791,11 +1825,8 @@
       -e 's/@''GNULIB_MDA_STRDUP''@/1/g' \
       -e 's/@''GNULIB_FREE_POSIX''@/1/g' \
       < ./string.in.h > string.h-t1
-mv inttypes.h-t inttypes.h
-/usr/bin/mkdir -p 'sys'
-mv signal.h-t signal.h
-/usr/bin/mkdir -p 'sys'
 /usr/bin/mkdir -p 'sys'
+mv sched.h-t sched.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''INCLUDE_NEXT''@|include_next|g' \
@@ -1812,51 +1843,10 @@
       -e '/definitions of _GL_FUNCDECL_RPL/r ./c++defs.h' \
       -e '/definition of _GL_WARN_ON_USE/r ./warn-on-use.h' \
       ./sys_select.in.h > sys/select.h-t
+mv inttypes.h-t inttypes.h
 /usr/bin/mkdir -p 'sys'
+mv stddef.h-t stddef.h
 /usr/bin/mkdir -p 'sys'
-sed \
-      -e 's|@''HAVE_PTHREAD_ONCE''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_MUTEX_INIT''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_MUTEXATTR_INIT''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_MUTEXATTR_GETTYPE''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_MUTEXATTR_SETTYPE''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_MUTEXATTR_GETROBUST''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_MUTEXATTR_SETROBUST''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_MUTEXATTR_DESTROY''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_MUTEX_LOCK''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_MUTEX_TRYLOCK''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_MUTEX_TIMEDLOCK''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_MUTEX_UNLOCK''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_MUTEX_DESTROY''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_RWLOCK_INIT''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_RWLOCKATTR_INIT''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_RWLOCKATTR_DESTROY''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_RWLOCK_RDLOCK''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_RWLOCK_WRLOCK''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_RWLOCK_TRYRDLOCK''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_RWLOCK_TRYWRLOCK''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_RWLOCK_TIMEDRDLOCK''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_RWLOCK_TIMEDWRLOCK''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_RWLOCK_UNLOCK''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_RWLOCK_DESTROY''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_COND_INIT''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_CONDATTR_INIT''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_CONDATTR_DESTROY''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_COND_WAIT''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_COND_TIMEDWAIT''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_COND_SIGNAL''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_COND_BROADCAST''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_COND_DESTROY''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_KEY_CREATE''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_SETSPECIFIC''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_GETSPECIFIC''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_KEY_DELETE''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_SPIN_INIT''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_SPIN_LOCK''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_SPIN_TRYLOCK''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_SPIN_UNLOCK''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_SPIN_DESTROY''@|1|g' \
-      < pthread.h-t1 > pthread.h-t2
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''INCLUDE_NEXT''@|include_next|g' \
@@ -1890,6 +1880,7 @@
       -e '/definition of _GL_ARG_NONNULL/r ./arg-nonnull.h' \
       -e '/definition of _GL_WARN_ON_USE/r ./warn-on-use.h' \
       ./sys_socket.in.h > sys/socket.h-t
+/usr/bin/mkdir -p 'sys'
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''INCLUDE_NEXT''@|include_next|g' \
@@ -1947,7 +1938,7 @@
       -e '/definition of _GL_ARG_NONNULL/r ./arg-nonnull.h' \
       -e '/definition of _GL_WARN_ON_USE/r ./warn-on-use.h' \
       ./sys_stat.in.h > sys/stat.h-t
-/usr/bin/mkdir -p 'sys'
+mv signal.h-t signal.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's/@''HAVE_SYS_TIME_H''@/1/g' \
@@ -1965,6 +1956,9 @@
       -e '/definition of _GL_ARG_NONNULL/r ./arg-nonnull.h' \
       -e '/definition of _GL_WARN_ON_USE/r ./warn-on-use.h' \
       ./sys_time.in.h > sys/time.h-t
+mv sys/select.h-t sys/select.h
+/usr/bin/mkdir -p 'sys'
+/usr/bin/mkdir -p 'sys'
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''INCLUDE_NEXT''@|include_next|g' \
@@ -1975,7 +1969,69 @@
       -e 's|@''HAVE_OFF64_T''@|1|g' \
       -e 's|@''WINDOWS_STAT_INODES''@|0|g' \
       ./sys_types.in.h > sys/types.h-t
-mv sys/select.h-t sys/select.h
+sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
+      -e 's|@''GUARD_PREFIX''@|GL|g' \
+      -e 's|@''INCLUDE_NEXT''@|include_next|g' \
+      -e 's|@''PRAGMA_SYSTEM_HEADER''@|#pragma GCC system_header|g' \
+      -e 's|@''PRAGMA_COLUMNS''@||g' \
+      -e 's|@''NEXT_SYS_UIO_H''@|<sys/uio.h>|g' \
+      -e 's|@''HAVE_SYS_UIO_H''@|1|g' \
+      ./sys_uio.in.h > sys/uio.h-t
+mv sys/types.h-t sys/types.h
+sed \
+      -e 's|@''HAVE_EXPLICIT_BZERO''@|1|g' \
+      -e 's|@''HAVE_FFSL''@|1|g' \
+      -e 's|@''HAVE_FFSLL''@|1|g' \
+      -e 's|@''HAVE_MBSLEN''@|0|g' \
+      -e 's|@''HAVE_DECL_MEMMEM''@|1|g' \
+      -e 's|@''HAVE_MEMPCPY''@|1|g' \
+      -e 's|@''HAVE_DECL_MEMRCHR''@|1|g' \
+      -e 's|@''HAVE_MEMSET_EXPLICIT''@|1|g' \
+      -e 's|@''HAVE_RAWMEMCHR''@|1|g' \
+      -e 's|@''HAVE_STPCPY''@|1|g' \
+      -e 's|@''HAVE_STPNCPY''@|1|g' \
+      -e 's|@''HAVE_STRCHRNUL''@|1|g' \
+      -e 's|@''HAVE_DECL_STRDUP''@|1|g' \
+      -e 's|@''HAVE_DECL_STRNDUP''@|1|g' \
+      -e 's|@''HAVE_DECL_STRNLEN''@|1|g' \
+      -e 's|@''HAVE_STRPBRK''@|1|g' \
+      -e 's|@''HAVE_STRSEP''@|1|g' \
+      -e 's|@''HAVE_STRCASESTR''@|1|g' \
+      -e 's|@''HAVE_DECL_STRTOK_R''@|1|g' \
+      -e 's|@''HAVE_DECL_STRERROR_R''@|1|g' \
+      -e 's|@''HAVE_STRERRORNAME_NP''@|1|g' \
+      -e 's|@''HAVE_SIGABBREV_NP''@|1|g' \
+      -e 's|@''HAVE_SIGDESCR_NP''@|1|g' \
+      -e 's|@''HAVE_DECL_STRSIGNAL''@|1|g' \
+      -e 's|@''HAVE_STRVERSCMP''@|1|g' \
+      -e 's|@''REPLACE_FFSLL''@|0|g' \
+      -e 's|@''REPLACE_MEMCHR''@|0|g' \
+      -e 's|@''REPLACE_MEMMEM''@|0|g' \
+      -e 's|@''REPLACE_MEMPCPY''@|0|g' \
+      -e 's|@''REPLACE_MEMSET_EXPLICIT''@|0|g' \
+      -e 's|@''REPLACE_FREE''@|0|g' \
+      -e 's|@''REPLACE_STPCPY''@|0|g' \
+      -e 's|@''REPLACE_STPNCPY''@|0|g' \
+      -e 's|@''REPLACE_STRCHRNUL''@|0|g' \
+      -e 's|@''REPLACE_STRDUP''@|0|g' \
+      -e 's|@''REPLACE_STRNCAT''@|0|g' \
+      -e 's|@''REPLACE_STRNDUP''@|0|g' \
+      -e 's|@''REPLACE_STRNLEN''@|0|g' \
+      -e 's|@''REPLACE_STRSTR''@|0|g' \
+      -e 's|@''REPLACE_STRCASESTR''@|0|g' \
+      -e 's|@''REPLACE_STRTOK_R''@|0|g' \
+      -e 's|@''REPLACE_STRERROR''@|0|g' \
+      -e 's|@''REPLACE_STRERROR_R''@|0|g' \
+      -e 's|@''REPLACE_STRERRORNAME_NP''@|0|g' \
+      -e 's|@''REPLACE_STRSIGNAL''@|0|g' \
+      -e 's|@''REPLACE_STRVERSCMP''@|0|g' \
+      -e 's|@''UNDEFINE_STRTOK_R''@|0|g' \
+      -e '/definitions of _GL_FUNCDECL_RPL/r ./c++defs.h' \
+      -e '/definition of _GL_ARG_NONNULL/r ./arg-nonnull.h' \
+      -e '/definition of _GL_WARN_ON_USE/r ./warn-on-use.h' \
+      < string.h-t1 > string.h-t2
+mv sys/time.h-t sys/time.h
+mv sys/uio.h-t sys/uio.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''INCLUDE_NEXT''@|include_next|g' \
@@ -2028,14 +2084,50 @@
       -e '/definition of _GL_ARG_NONNULL/r ./arg-nonnull.h' \
       -e '/definition of _GL_WARN_ON_USE/r ./warn-on-use.h' \
       ./time.in.h > time.h-t
-sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
-      -e 's|@''GUARD_PREFIX''@|GL|g' \
-      -e 's|@''INCLUDE_NEXT''@|include_next|g' \
-      -e 's|@''PRAGMA_SYSTEM_HEADER''@|#pragma GCC system_header|g' \
-      -e 's|@''PRAGMA_COLUMNS''@||g' \
-      -e 's|@''NEXT_SYS_UIO_H''@|<sys/uio.h>|g' \
-      -e 's|@''HAVE_SYS_UIO_H''@|1|g' \
-      ./sys_uio.in.h > sys/uio.h-t
+sed \
+      -e 's|@''HAVE_PTHREAD_ONCE''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_MUTEX_INIT''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_MUTEXATTR_INIT''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_MUTEXATTR_GETTYPE''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_MUTEXATTR_SETTYPE''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_MUTEXATTR_GETROBUST''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_MUTEXATTR_SETROBUST''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_MUTEXATTR_DESTROY''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_MUTEX_LOCK''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_MUTEX_TRYLOCK''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_MUTEX_TIMEDLOCK''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_MUTEX_UNLOCK''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_MUTEX_DESTROY''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_RWLOCK_INIT''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_RWLOCKATTR_INIT''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_RWLOCKATTR_DESTROY''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_RWLOCK_RDLOCK''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_RWLOCK_WRLOCK''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_RWLOCK_TRYRDLOCK''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_RWLOCK_TRYWRLOCK''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_RWLOCK_TIMEDRDLOCK''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_RWLOCK_TIMEDWRLOCK''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_RWLOCK_UNLOCK''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_RWLOCK_DESTROY''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_COND_INIT''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_CONDATTR_INIT''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_CONDATTR_DESTROY''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_COND_WAIT''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_COND_TIMEDWAIT''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_COND_SIGNAL''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_COND_BROADCAST''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_COND_DESTROY''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_KEY_CREATE''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_SETSPECIFIC''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_GETSPECIFIC''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_KEY_DELETE''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_SPIN_INIT''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_SPIN_LOCK''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_SPIN_TRYLOCK''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_SPIN_UNLOCK''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_SPIN_DESTROY''@|1|g' \
+      < pthread.h-t1 > pthread.h-t2
+mv sys/socket.h-t sys/socket.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''HAVE_UNISTD_H''@|1|g' \
@@ -2139,7 +2231,56 @@
       -e 's/@''GNULIB_MDA_WCSDUP''@/1/g' \
       -e 's/@''GNULIB_FREE_POSIX''@/1/g' \
       < ./wchar.in.h > wchar.h-t1
-mv sys/time.h-t sys/time.h
+sed \
+      -e 's|@''HAVE__EXIT''@|1|g' \
+      -e 's|@''HAVE_ALIGNED_ALLOC''@|1|g' \
+      -e 's|@''HAVE_ATOLL''@|1|g' \
+      -e 's|@''HAVE_CANONICALIZE_FILE_NAME''@|1|g' \
+      -e 's|@''HAVE_DECL_ECVT''@|1|g' \
+      -e 's|@''HAVE_DECL_FCVT''@|1|g' \
+      -e 's|@''HAVE_DECL_GCVT''@|1|g' \
+      -e 's|@''HAVE_DECL_GETLOADAVG''@|1|g' \
+      -e 's|@''HAVE_DECL_PROGRAM_INVOCATION_NAME''@|1|g' \
+      -e 's|@''HAVE_GETPROGNAME''@|1|g' \
+      -e 's|@''HAVE_GETSUBOPT''@|1|g' \
+      -e 's|@''HAVE_GRANTPT''@|1|g' \
+      -e 's|@''HAVE_INITSTATE''@|1|g' \
+      -e 's|@''HAVE_DECL_INITSTATE''@|1|g' \
+      -e 's|@''HAVE_MBTOWC''@|1|g' \
+      -e 's|@''HAVE_MKDTEMP''@|1|g' \
+      -e 's|@''HAVE_MKOSTEMP''@|1|g' \
+      -e 's|@''HAVE_MKOSTEMPS''@|1|g' \
+      -e 's|@''HAVE_MKSTEMP''@|1|g' \
+      -e 's|@''HAVE_MKSTEMPS''@|1|g' \
+      -e 's|@''HAVE_POSIX_MEMALIGN''@|1|g' \
+      -e 's|@''HAVE_POSIX_OPENPT''@|1|g' \
+      -e 's|@''HAVE_PTSNAME''@|1|g' \
+      -e 's|@''HAVE_PTSNAME_R''@|1|g' \
+      -e 's|@''HAVE_QSORT_R''@|1|g' \
+      -e 's|@''HAVE_RANDOM''@|1|g' \
+      -e 's|@''HAVE_RANDOM_H''@|1|g' \
+      -e 's|@''HAVE_RANDOM_R''@|1|g' \
+      -e 's|@''HAVE_REALLOCARRAY''@|1|g' \
+      -e 's|@''HAVE_REALPATH''@|1|g' \
+      -e 's|@''HAVE_RPMATCH''@|1|g' \
+      -e 's|@''HAVE_SECURE_GETENV''@|1|g' \
+      -e 's|@''HAVE_DECL_SETENV''@|1|g' \
+      -e 's|@''HAVE_SETSTATE''@|1|g' \
+      -e 's|@''HAVE_DECL_SETSTATE''@|1|g' \
+      -e 's|@''HAVE_STRTOD''@|1|g' \
+      -e 's|@''HAVE_STRTOF''@|1|g' \
+      -e 's|@''HAVE_STRTOL''@|1|g' \
+      -e 's|@''HAVE_STRTOLD''@|1|g' \
+      -e 's|@''HAVE_STRTOLL''@|1|g' \
+      -e 's|@''HAVE_STRTOUL''@|1|g' \
+      -e 's|@''HAVE_STRTOULL''@|1|g' \
+      -e 's|@''HAVE_STRUCT_RANDOM_DATA''@|1|g' \
+      -e 's|@''HAVE_SYS_LOADAVG_H''@|0|g' \
+      -e 's|@''HAVE_UNLOCKPT''@|1|g' \
+      -e 's|@''HAVE_DECL_UNSETENV''@|1|g' \
+      < stdlib.h-t1 > stdlib.h-t2
+mv utime.h-t utime.h
+rm -f string.h-t1
 sed \
       -e 's/@''GNULIB_ILOGB''@/0/g' \
       -e 's/@''GNULIB_ILOGBF''@/0/g' \
@@ -2215,149 +2356,31 @@
       -e 's/@''GNULIB_MDA_Y1''@/1/g' \
       -e 's/@''GNULIB_MDA_YN''@/1/g' \
       < math.h-t1 > math.h-t2
-sed \
-      -e 's|@''HAVE_EXPLICIT_BZERO''@|1|g' \
-      -e 's|@''HAVE_FFSL''@|1|g' \
-      -e 's|@''HAVE_FFSLL''@|1|g' \
-      -e 's|@''HAVE_MBSLEN''@|0|g' \
-      -e 's|@''HAVE_DECL_MEMMEM''@|1|g' \
-      -e 's|@''HAVE_MEMPCPY''@|1|g' \
-      -e 's|@''HAVE_DECL_MEMRCHR''@|1|g' \
-      -e 's|@''HAVE_MEMSET_EXPLICIT''@|1|g' \
-      -e 's|@''HAVE_RAWMEMCHR''@|1|g' \
-      -e 's|@''HAVE_STPCPY''@|1|g' \
-      -e 's|@''HAVE_STPNCPY''@|1|g' \
-      -e 's|@''HAVE_STRCHRNUL''@|1|g' \
-      -e 's|@''HAVE_DECL_STRDUP''@|1|g' \
-      -e 's|@''HAVE_DECL_STRNDUP''@|1|g' \
-      -e 's|@''HAVE_DECL_STRNLEN''@|1|g' \
-      -e 's|@''HAVE_STRPBRK''@|1|g' \
-      -e 's|@''HAVE_STRSEP''@|1|g' \
-      -e 's|@''HAVE_STRCASESTR''@|1|g' \
-      -e 's|@''HAVE_DECL_STRTOK_R''@|1|g' \
-      -e 's|@''HAVE_DECL_STRERROR_R''@|1|g' \
-      -e 's|@''HAVE_STRERRORNAME_NP''@|1|g' \
-      -e 's|@''HAVE_SIGABBREV_NP''@|1|g' \
-      -e 's|@''HAVE_SIGDESCR_NP''@|1|g' \
-      -e 's|@''HAVE_DECL_STRSIGNAL''@|1|g' \
-      -e 's|@''HAVE_STRVERSCMP''@|1|g' \
-      -e 's|@''REPLACE_FFSLL''@|0|g' \
-      -e 's|@''REPLACE_MEMCHR''@|0|g' \
-      -e 's|@''REPLACE_MEMMEM''@|0|g' \
-      -e 's|@''REPLACE_MEMPCPY''@|0|g' \
-      -e 's|@''REPLACE_MEMSET_EXPLICIT''@|0|g' \
-      -e 's|@''REPLACE_FREE''@|0|g' \
-      -e 's|@''REPLACE_STPCPY''@|0|g' \
-      -e 's|@''REPLACE_STPNCPY''@|0|g' \
-      -e 's|@''REPLACE_STRCHRNUL''@|0|g' \
-      -e 's|@''REPLACE_STRDUP''@|0|g' \
-      -e 's|@''REPLACE_STRNCAT''@|0|g' \
-      -e 's|@''REPLACE_STRNDUP''@|0|g' \
-      -e 's|@''REPLACE_STRNLEN''@|0|g' \
-      -e 's|@''REPLACE_STRSTR''@|0|g' \
-      -e 's|@''REPLACE_STRCASESTR''@|0|g' \
-      -e 's|@''REPLACE_STRTOK_R''@|0|g' \
-      -e 's|@''REPLACE_STRERROR''@|0|g' \
-      -e 's|@''REPLACE_STRERROR_R''@|0|g' \
-      -e 's|@''REPLACE_STRERRORNAME_NP''@|0|g' \
-      -e 's|@''REPLACE_STRSIGNAL''@|0|g' \
-      -e 's|@''REPLACE_STRVERSCMP''@|0|g' \
-      -e 's|@''UNDEFINE_STRTOK_R''@|0|g' \
-      -e '/definitions of _GL_FUNCDECL_RPL/r ./c++defs.h' \
-      -e '/definition of _GL_ARG_NONNULL/r ./arg-nonnull.h' \
-      -e '/definition of _GL_WARN_ON_USE/r ./warn-on-use.h' \
-      < string.h-t1 > string.h-t2
-mv sys/types.h-t sys/types.h
-mv sys/uio.h-t sys/uio.h
-sed \
-      -e 's|@''HAVE__EXIT''@|1|g' \
-      -e 's|@''HAVE_ALIGNED_ALLOC''@|1|g' \
-      -e 's|@''HAVE_ATOLL''@|1|g' \
-      -e 's|@''HAVE_CANONICALIZE_FILE_NAME''@|1|g' \
-      -e 's|@''HAVE_DECL_ECVT''@|1|g' \
-      -e 's|@''HAVE_DECL_FCVT''@|1|g' \
-      -e 's|@''HAVE_DECL_GCVT''@|1|g' \
-      -e 's|@''HAVE_DECL_GETLOADAVG''@|1|g' \
-      -e 's|@''HAVE_DECL_PROGRAM_INVOCATION_NAME''@|1|g' \
-      -e 's|@''HAVE_GETPROGNAME''@|1|g' \
-      -e 's|@''HAVE_GETSUBOPT''@|1|g' \
-      -e 's|@''HAVE_GRANTPT''@|1|g' \
-      -e 's|@''HAVE_INITSTATE''@|1|g' \
-      -e 's|@''HAVE_DECL_INITSTATE''@|1|g' \
-      -e 's|@''HAVE_MBTOWC''@|1|g' \
-      -e 's|@''HAVE_MKDTEMP''@|1|g' \
-      -e 's|@''HAVE_MKOSTEMP''@|1|g' \
-      -e 's|@''HAVE_MKOSTEMPS''@|1|g' \
-      -e 's|@''HAVE_MKSTEMP''@|1|g' \
-      -e 's|@''HAVE_MKSTEMPS''@|1|g' \
-      -e 's|@''HAVE_POSIX_MEMALIGN''@|1|g' \
-      -e 's|@''HAVE_POSIX_OPENPT''@|1|g' \
-      -e 's|@''HAVE_PTSNAME''@|1|g' \
-      -e 's|@''HAVE_PTSNAME_R''@|1|g' \
-      -e 's|@''HAVE_QSORT_R''@|1|g' \
-      -e 's|@''HAVE_RANDOM''@|1|g' \
-      -e 's|@''HAVE_RANDOM_H''@|1|g' \
-      -e 's|@''HAVE_RANDOM_R''@|1|g' \
-      -e 's|@''HAVE_REALLOCARRAY''@|1|g' \
-      -e 's|@''HAVE_REALPATH''@|1|g' \
-      -e 's|@''HAVE_RPMATCH''@|1|g' \
-      -e 's|@''HAVE_SECURE_GETENV''@|1|g' \
-      -e 's|@''HAVE_DECL_SETENV''@|1|g' \
-      -e 's|@''HAVE_SETSTATE''@|1|g' \
-      -e 's|@''HAVE_DECL_SETSTATE''@|1|g' \
-      -e 's|@''HAVE_STRTOD''@|1|g' \
-      -e 's|@''HAVE_STRTOF''@|1|g' \
-      -e 's|@''HAVE_STRTOL''@|1|g' \
-      -e 's|@''HAVE_STRTOLD''@|1|g' \
-      -e 's|@''HAVE_STRTOLL''@|1|g' \
-      -e 's|@''HAVE_STRTOUL''@|1|g' \
-      -e 's|@''HAVE_STRTOULL''@|1|g' \
-      -e 's|@''HAVE_STRUCT_RANDOM_DATA''@|1|g' \
-      -e 's|@''HAVE_SYS_LOADAVG_H''@|0|g' \
-      -e 's|@''HAVE_UNLOCKPT''@|1|g' \
-      -e 's|@''HAVE_DECL_UNSETENV''@|1|g' \
-      < stdlib.h-t1 > stdlib.h-t2
-mv sys/socket.h-t sys/socket.h
-mv utime.h-t utime.h
-sed \
-      -e 's|@''REPLACE_PTHREAD_CREATE''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_ATTR_INIT''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_ATTR_GETDETACHSTATE''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_ATTR_SETDETACHSTATE''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_ATTR_DESTROY''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_SELF''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_EQUAL''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_DETACH''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_JOIN''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_EXIT''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_ONCE''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_MUTEX_INIT''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_MUTEXATTR_INIT''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_MUTEXATTR_GETTYPE''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_MUTEXATTR_SETTYPE''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_MUTEXATTR_GETROBUST''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_MUTEXATTR_SETROBUST''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_MUTEXATTR_DESTROY''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_MUTEX_LOCK''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_MUTEX_TRYLOCK''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_MUTEX_TIMEDLOCK''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_MUTEX_UNLOCK''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_MUTEX_DESTROY''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_RWLOCK_INIT''@|1|g' \
-      -e 's|@''REPLACE_PTHREAD_RWLOCKATTR_INIT''@|1|g' \
-      -e 's|@''REPLACE_PTHREAD_RWLOCKATTR_DESTROY''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_RWLOCK_RDLOCK''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_RWLOCK_WRLOCK''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_RWLOCK_TRYRDLOCK''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_RWLOCK_TRYWRLOCK''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_RWLOCK_TIMEDRDLOCK''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_RWLOCK_TIMEDWRLOCK''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_RWLOCK_UNLOCK''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_RWLOCK_DESTROY''@|0|g' \
-      < pthread.h-t2 > pthread.h-t3
 mv time.h-t time.h
 mv sys/stat.h-t sys/stat.h
 sed \
+      -e 's|@''HAVE_DECL_FCLOSEALL''@|1|g' \
+      -e 's|@''HAVE_DECL_FPURGE''@|1|g' \
+      -e 's|@''HAVE_DECL_FSEEKO''@|1|g' \
+      -e 's|@''HAVE_DECL_FTELLO''@|1|g' \
+      -e 's|@''HAVE_DECL_GETDELIM''@|1|g' \
+      -e 's|@''HAVE_DECL_GETLINE''@|1|g' \
+      -e 's|@''HAVE_DECL_GETW''@|1|g' \
+      -e 's|@''HAVE_DECL_OBSTACK_PRINTF''@|1|g' \
+      -e 's|@''HAVE_DECL_PUTW''@|1|g' \
+      -e 's|@''HAVE_DECL_SNPRINTF''@|1|g' \
+      -e 's|@''HAVE_DECL_VSNPRINTF''@|1|g' \
+      -e 's|@''HAVE_DPRINTF''@|1|g' \
+      -e 's|@''HAVE_FSEEKO''@|1|g' \
+      -e 's|@''HAVE_FTELLO''@|1|g' \
+      -e 's|@''HAVE_PCLOSE''@|1|g' \
+      -e 's|@''HAVE_POPEN''@|1|g' \
+      -e 's|@''HAVE_RENAMEAT''@|1|g' \
+      -e 's|@''HAVE_VASPRINTF''@|1|g' \
+      -e 's|@''HAVE_VDPRINTF''@|1|g' \
+      < stdio.h-t1 > stdio.h-t2
+mv string.h-t2 string.h
+sed \
       -e 's/@''GNULIB_GETCWD''@/0/g' \
       -e 's/@''GNULIB_GETDOMAINNAME''@/0/g' \
       -e 's/@''GNULIB_GETDTABLESIZE''@/0/g' \
@@ -2421,27 +2444,86 @@
       -e 's/@''GNULIB_MDA_WRITE''@/1/g' \
       < unistd.h-t1 > unistd.h-t2
 sed \
-      -e 's|@''HAVE_DECL_FCLOSEALL''@|1|g' \
-      -e 's|@''HAVE_DECL_FPURGE''@|1|g' \
-      -e 's|@''HAVE_DECL_FSEEKO''@|1|g' \
-      -e 's|@''HAVE_DECL_FTELLO''@|1|g' \
-      -e 's|@''HAVE_DECL_GETDELIM''@|1|g' \
-      -e 's|@''HAVE_DECL_GETLINE''@|1|g' \
-      -e 's|@''HAVE_DECL_GETW''@|1|g' \
-      -e 's|@''HAVE_DECL_OBSTACK_PRINTF''@|1|g' \
-      -e 's|@''HAVE_DECL_PUTW''@|1|g' \
-      -e 's|@''HAVE_DECL_SNPRINTF''@|1|g' \
-      -e 's|@''HAVE_DECL_VSNPRINTF''@|1|g' \
-      -e 's|@''HAVE_DPRINTF''@|1|g' \
-      -e 's|@''HAVE_FSEEKO''@|1|g' \
-      -e 's|@''HAVE_FTELLO''@|1|g' \
-      -e 's|@''HAVE_PCLOSE''@|1|g' \
-      -e 's|@''HAVE_POPEN''@|1|g' \
-      -e 's|@''HAVE_RENAMEAT''@|1|g' \
-      -e 's|@''HAVE_VASPRINTF''@|1|g' \
-      -e 's|@''HAVE_VDPRINTF''@|1|g' \
-      < stdio.h-t1 > stdio.h-t2
-rm -f string.h-t1
+      -e 's|@''HAVE_WINT_T''@|1|g' \
+      -e 's|@''HAVE_BTOWC''@|1|g' \
+      -e 's|@''HAVE_MBSINIT''@|1|g' \
+      -e 's|@''HAVE_MBRTOWC''@|1|g' \
+      -e 's|@''HAVE_MBRLEN''@|1|g' \
+      -e 's|@''HAVE_MBSRTOWCS''@|1|g' \
+      -e 's|@''HAVE_MBSNRTOWCS''@|1|g' \
+      -e 's|@''HAVE_WCRTOMB''@|1|g' \
+      -e 's|@''HAVE_WCSRTOMBS''@|1|g' \
+      -e 's|@''HAVE_WCSNRTOMBS''@|1|g' \
+      -e 's|@''HAVE_WMEMCHR''@|1|g' \
+      -e 's|@''HAVE_WMEMCMP''@|1|g' \
+      -e 's|@''HAVE_WMEMCPY''@|1|g' \
+      -e 's|@''HAVE_WMEMMOVE''@|1|g' \
+      -e 's|@''HAVE_WMEMPCPY''@|1|g' \
+      -e 's|@''HAVE_WMEMSET''@|1|g' \
+      -e 's|@''HAVE_WCSLEN''@|1|g' \
+      -e 's|@''HAVE_WCSNLEN''@|1|g' \
+      -e 's|@''HAVE_WCSCPY''@|1|g' \
+      -e 's|@''HAVE_WCPCPY''@|1|g' \
+      -e 's|@''HAVE_WCSNCPY''@|1|g' \
+      -e 's|@''HAVE_WCPNCPY''@|1|g' \
+      -e 's|@''HAVE_WCSCAT''@|1|g' \
+      -e 's|@''HAVE_WCSNCAT''@|1|g' \
+      -e 's|@''HAVE_WCSCMP''@|1|g' \
+      -e 's|@''HAVE_WCSNCMP''@|1|g' \
+      -e 's|@''HAVE_WCSCASECMP''@|1|g' \
+      -e 's|@''HAVE_WCSNCASECMP''@|1|g' \
+      -e 's|@''HAVE_WCSCOLL''@|1|g' \
+      -e 's|@''HAVE_WCSXFRM''@|1|g' \
+      -e 's|@''HAVE_WCSDUP''@|1|g' \
+      -e 's|@''HAVE_WCSCHR''@|1|g' \
+      -e 's|@''HAVE_WCSRCHR''@|1|g' \
+      -e 's|@''HAVE_WCSCSPN''@|1|g' \
+      -e 's|@''HAVE_WCSSPN''@|1|g' \
+      -e 's|@''HAVE_WCSPBRK''@|1|g' \
+      -e 's|@''HAVE_WCSSTR''@|1|g' \
+      -e 's|@''HAVE_WCSTOK''@|1|g' \
+      -e 's|@''HAVE_WCSWIDTH''@|1|g' \
+      -e 's|@''HAVE_WCSFTIME''@|1|g' \
+      -e 's|@''HAVE_DECL_WCTOB''@|1|g' \
+      -e 's|@''HAVE_DECL_WCSDUP''@|1|g' \
+      -e 's|@''HAVE_DECL_WCWIDTH''@|1|g' \
+      < wchar.h-t1 > wchar.h-t2
+sed \
+      -e 's|@''REPLACE_PTHREAD_CREATE''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_ATTR_INIT''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_ATTR_GETDETACHSTATE''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_ATTR_SETDETACHSTATE''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_ATTR_DESTROY''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_SELF''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_EQUAL''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_DETACH''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_JOIN''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_EXIT''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_ONCE''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_MUTEX_INIT''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_MUTEXATTR_INIT''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_MUTEXATTR_GETTYPE''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_MUTEXATTR_SETTYPE''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_MUTEXATTR_GETROBUST''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_MUTEXATTR_SETROBUST''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_MUTEXATTR_DESTROY''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_MUTEX_LOCK''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_MUTEX_TRYLOCK''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_MUTEX_TIMEDLOCK''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_MUTEX_UNLOCK''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_MUTEX_DESTROY''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_RWLOCK_INIT''@|1|g' \
+      -e 's|@''REPLACE_PTHREAD_RWLOCKATTR_INIT''@|1|g' \
+      -e 's|@''REPLACE_PTHREAD_RWLOCKATTR_DESTROY''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_RWLOCK_RDLOCK''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_RWLOCK_WRLOCK''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_RWLOCK_TRYRDLOCK''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_RWLOCK_TRYWRLOCK''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_RWLOCK_TIMEDRDLOCK''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_RWLOCK_TIMEDWRLOCK''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_RWLOCK_UNLOCK''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_RWLOCK_DESTROY''@|0|g' \
+      < pthread.h-t2 > pthread.h-t3
 sed \
       -e 's|@''REPLACE_DPRINTF''@|0|g' \
       -e 's|@''REPLACE_FCLOSE''@|0|g' \
@@ -2530,7 +2612,82 @@
       -e '/definition of _GL_ARG_NONNULL/r ./arg-nonnull.h' \
       -e '/definition of _GL_WARN_ON_USE/r ./warn-on-use.h' \
       < stdlib.h-t2 > stdlib.h-t3
-mv string.h-t2 string.h
+sed \
+      -e 's|@''REPLACE_MBSTATE_T''@|0|g' \
+      -e 's|@''REPLACE_BTOWC''@|0|g' \
+      -e 's|@''REPLACE_WCTOB''@|0|g' \
+      -e 's|@''REPLACE_FREE''@|0|g' \
+      -e 's|@''REPLACE_MBSINIT''@|0|g' \
+      -e 's|@''REPLACE_MBRTOWC''@|0|g' \
+      -e 's|@''REPLACE_MBRLEN''@|0|g' \
+      -e 's|@''REPLACE_MBSRTOWCS''@|0|g' \
+      -e 's|@''REPLACE_MBSNRTOWCS''@|0|g' \
+      -e 's|@''REPLACE_WCRTOMB''@|0|g' \
+      -e 's|@''REPLACE_WCSRTOMBS''@|0|g' \
+      -e 's|@''REPLACE_WCSNRTOMBS''@|0|g' \
+      -e 's|@''REPLACE_WCWIDTH''@|0|g' \
+      -e 's|@''REPLACE_WCSWIDTH''@|0|g' \
+      -e 's|@''REPLACE_WCSFTIME''@|0|g' \
+      -e 's|@''REPLACE_WCSCMP''@|0|g' \
+      -e 's|@''REPLACE_WCSNCAT''@|0|g' \
+      -e 's|@''REPLACE_WCSNCMP''@|0|g' \
+      -e 's|@''REPLACE_WCSSTR''@|0|g' \
+      -e 's|@''REPLACE_WCSTOK''@|0|g' \
+      -e 's|@''REPLACE_WMEMCMP''@|0|g' \
+      -e 's|@''REPLACE_WMEMPCPY''@|0|g' \
+      -e '/definitions of _GL_FUNCDECL_RPL/r ./c++defs.h' \
+      -e '/definition of _GL_ARG_NONNULL/r ./arg-nonnull.h' \
+      -e '/definition of _GL_WARN_ON_USE/r ./warn-on-use.h' \
+      < wchar.h-t2 > wchar.h-t3
+sed \
+      -e 's|@''HAVE_CHOWN''@|1|g' \
+      -e 's|@''HAVE_COPY_FILE_RANGE''@|1|g' \
+      -e 's|@''HAVE_DUP3''@|1|g' \
+      -e 's|@''HAVE_EUIDACCESS''@|1|g' \
+      -e 's|@''HAVE_EXECVPE''@|1|g' \
+      -e 's|@''HAVE_FACCESSAT''@|1|g' \
+      -e 's|@''HAVE_FCHDIR''@|1|g' \
+      -e 's|@''HAVE_FCHOWNAT''@|1|g' \
+      -e 's|@''HAVE_FDATASYNC''@|1|g' \
+      -e 's|@''HAVE_FSYNC''@|1|g' \
+      -e 's|@''HAVE_FTRUNCATE''@|1|g' \
+      -e 's|@''HAVE_GETDTABLESIZE''@|1|g' \
+      -e 's|@''HAVE_GETENTROPY''@|1|g' \
+      -e 's|@''HAVE_GETGROUPS''@|1|g' \
+      -e 's|@''HAVE_GETHOSTNAME''@|1|g' \
+      -e 's|@''HAVE_GETPAGESIZE''@|1|g' \
+      -e 's|@''HAVE_GETPASS''@|1|g' \
+      -e 's|@''HAVE_GROUP_MEMBER''@|1|g' \
+      -e 's|@''HAVE_LCHOWN''@|1|g' \
+      -e 's|@''HAVE_LINK''@|1|g' \
+      -e 's|@''HAVE_LINKAT''@|1|g' \
+      -e 's|@''HAVE_PIPE''@|1|g' \
+      -e 's|@''HAVE_PIPE2''@|1|g' \
+      -e 's|@''HAVE_PREAD''@|1|g' \
+      -e 's|@''HAVE_PWRITE''@|1|g' \
+      -e 's|@''HAVE_READLINK''@|1|g' \
+      -e 's|@''HAVE_READLINKAT''@|1|g' \
+      -e 's|@''HAVE_SETHOSTNAME''@|1|g' \
+      -e 's|@''HAVE_SLEEP''@|1|g' \
+      -e 's|@''HAVE_SYMLINK''@|1|g' \
+      -e 's|@''HAVE_SYMLINKAT''@|1|g' \
+      -e 's|@''HAVE_UNLINKAT''@|1|g' \
+      -e 's|@''HAVE_USLEEP''@|1|g' \
+      -e 's|@''HAVE_DECL_ENVIRON''@|1|g' \
+      -e 's|@''HAVE_DECL_EXECVPE''@|1|g' \
+      -e 's|@''HAVE_DECL_FCHDIR''@|1|g' \
+      -e 's|@''HAVE_DECL_FDATASYNC''@|1|g' \
+      -e 's|@''HAVE_DECL_GETDOMAINNAME''@|1|g' \
+      -e 's|@''HAVE_DECL_GETLOGIN''@|1|g' \
+      -e 's|@''HAVE_DECL_GETLOGIN_R''@|1|g' \
+      -e 's|@''HAVE_DECL_GETPAGESIZE''@|1|g' \
+      -e 's|@''HAVE_DECL_GETUSERSHELL''@|1|g' \
+      -e 's|@''HAVE_DECL_SETHOSTNAME''@|1|g' \
+      -e 's|@''HAVE_DECL_TRUNCATE''@|1|g' \
+      -e 's|@''HAVE_DECL_TTYNAME_R''@|1|g' \
+      -e 's|@''HAVE_OS_H''@|0|g' \
+      -e 's|@''HAVE_SYS_PARAM_H''@|0|g' \
+      < unistd.h-t2 > unistd.h-t3
 sed \
       -e 's|@''REPLACE_PTHREAD_COND_INIT''@|0|g' \
       -e 's|@''REPLACE_PTHREAD_CONDATTR_INIT''@|0|g' \
@@ -2554,51 +2711,9 @@
       -e '/definition of _GL_ARG_NONNULL/r ./arg-nonnull.h' \
       -e '/definition of _GL_WARN_ON_USE/r ./warn-on-use.h' \
       < pthread.h-t3 > pthread.h-t4
-sed \
-      -e 's|@''HAVE_WINT_T''@|1|g' \
-      -e 's|@''HAVE_BTOWC''@|1|g' \
-      -e 's|@''HAVE_MBSINIT''@|1|g' \
-      -e 's|@''HAVE_MBRTOWC''@|1|g' \
-      -e 's|@''HAVE_MBRLEN''@|1|g' \
-      -e 's|@''HAVE_MBSRTOWCS''@|1|g' \
-      -e 's|@''HAVE_MBSNRTOWCS''@|1|g' \
-      -e 's|@''HAVE_WCRTOMB''@|1|g' \
-      -e 's|@''HAVE_WCSRTOMBS''@|1|g' \
-      -e 's|@''HAVE_WCSNRTOMBS''@|1|g' \
-      -e 's|@''HAVE_WMEMCHR''@|1|g' \
-      -e 's|@''HAVE_WMEMCMP''@|1|g' \
-      -e 's|@''HAVE_WMEMCPY''@|1|g' \
-      -e 's|@''HAVE_WMEMMOVE''@|1|g' \
-      -e 's|@''HAVE_WMEMPCPY''@|1|g' \
-      -e 's|@''HAVE_WMEMSET''@|1|g' \
-      -e 's|@''HAVE_WCSLEN''@|1|g' \
-      -e 's|@''HAVE_WCSNLEN''@|1|g' \
-      -e 's|@''HAVE_WCSCPY''@|1|g' \
-      -e 's|@''HAVE_WCPCPY''@|1|g' \
-      -e 's|@''HAVE_WCSNCPY''@|1|g' \
-      -e 's|@''HAVE_WCPNCPY''@|1|g' \
-      -e 's|@''HAVE_WCSCAT''@|1|g' \
-      -e 's|@''HAVE_WCSNCAT''@|1|g' \
-      -e 's|@''HAVE_WCSCMP''@|1|g' \
-      -e 's|@''HAVE_WCSNCMP''@|1|g' \
-      -e 's|@''HAVE_WCSCASECMP''@|1|g' \
-      -e 's|@''HAVE_WCSNCASECMP''@|1|g' \
-      -e 's|@''HAVE_WCSCOLL''@|1|g' \
-      -e 's|@''HAVE_WCSXFRM''@|1|g' \
-      -e 's|@''HAVE_WCSDUP''@|1|g' \
-      -e 's|@''HAVE_WCSCHR''@|1|g' \
-      -e 's|@''HAVE_WCSRCHR''@|1|g' \
-      -e 's|@''HAVE_WCSCSPN''@|1|g' \
-      -e 's|@''HAVE_WCSSPN''@|1|g' \
-      -e 's|@''HAVE_WCSPBRK''@|1|g' \
-      -e 's|@''HAVE_WCSSTR''@|1|g' \
-      -e 's|@''HAVE_WCSTOK''@|1|g' \
-      -e 's|@''HAVE_WCSWIDTH''@|1|g' \
-      -e 's|@''HAVE_WCSFTIME''@|1|g' \
-      -e 's|@''HAVE_DECL_WCTOB''@|1|g' \
-      -e 's|@''HAVE_DECL_WCSDUP''@|1|g' \
-      -e 's|@''HAVE_DECL_WCWIDTH''@|1|g' \
-      < wchar.h-t1 > wchar.h-t2
+rm -f stdio.h-t1 stdio.h-t2
+mv stdio.h-t3 stdio.h
+rm -f wchar.h-t1 wchar.h-t2
 sed \
       -e 's|@''HAVE_ACOSF''@|1|g' \
       -e 's|@''HAVE_ACOSL''@|1|g' \
@@ -2679,90 +2794,11 @@
       -e 's|@''HAVE_TOTALORDERMAGF''@|1|g' \
       -e 's|@''HAVE_TOTALORDERMAGL''@|1|g' \
       < math.h-t2 > math.h-t3
-rm -f pthread.h-t1 pthread.h-t2 pthread.h-t3
-sed \
-      -e 's|@''HAVE_CHOWN''@|1|g' \
-      -e 's|@''HAVE_COPY_FILE_RANGE''@|1|g' \
-      -e 's|@''HAVE_DUP3''@|1|g' \
-      -e 's|@''HAVE_EUIDACCESS''@|1|g' \
-      -e 's|@''HAVE_EXECVPE''@|1|g' \
-      -e 's|@''HAVE_FACCESSAT''@|1|g' \
-      -e 's|@''HAVE_FCHDIR''@|1|g' \
-      -e 's|@''HAVE_FCHOWNAT''@|1|g' \
-      -e 's|@''HAVE_FDATASYNC''@|1|g' \
-      -e 's|@''HAVE_FSYNC''@|1|g' \
-      -e 's|@''HAVE_FTRUNCATE''@|1|g' \
-      -e 's|@''HAVE_GETDTABLESIZE''@|1|g' \
-      -e 's|@''HAVE_GETENTROPY''@|1|g' \
-      -e 's|@''HAVE_GETGROUPS''@|1|g' \
-      -e 's|@''HAVE_GETHOSTNAME''@|1|g' \
-      -e 's|@''HAVE_GETPAGESIZE''@|1|g' \
-      -e 's|@''HAVE_GETPASS''@|1|g' \
-      -e 's|@''HAVE_GROUP_MEMBER''@|1|g' \
-      -e 's|@''HAVE_LCHOWN''@|1|g' \
-      -e 's|@''HAVE_LINK''@|1|g' \
-      -e 's|@''HAVE_LINKAT''@|1|g' \
-      -e 's|@''HAVE_PIPE''@|1|g' \
-      -e 's|@''HAVE_PIPE2''@|1|g' \
-      -e 's|@''HAVE_PREAD''@|1|g' \
-      -e 's|@''HAVE_PWRITE''@|1|g' \
-      -e 's|@''HAVE_READLINK''@|1|g' \
-      -e 's|@''HAVE_READLINKAT''@|1|g' \
-      -e 's|@''HAVE_SETHOSTNAME''@|1|g' \
-      -e 's|@''HAVE_SLEEP''@|1|g' \
-      -e 's|@''HAVE_SYMLINK''@|1|g' \
-      -e 's|@''HAVE_SYMLINKAT''@|1|g' \
-      -e 's|@''HAVE_UNLINKAT''@|1|g' \
-      -e 's|@''HAVE_USLEEP''@|1|g' \
-      -e 's|@''HAVE_DECL_ENVIRON''@|1|g' \
-      -e 's|@''HAVE_DECL_EXECVPE''@|1|g' \
-      -e 's|@''HAVE_DECL_FCHDIR''@|1|g' \
-      -e 's|@''HAVE_DECL_FDATASYNC''@|1|g' \
-      -e 's|@''HAVE_DECL_GETDOMAINNAME''@|1|g' \
-      -e 's|@''HAVE_DECL_GETLOGIN''@|1|g' \
-      -e 's|@''HAVE_DECL_GETLOGIN_R''@|1|g' \
-      -e 's|@''HAVE_DECL_GETPAGESIZE''@|1|g' \
-      -e 's|@''HAVE_DECL_GETUSERSHELL''@|1|g' \
-      -e 's|@''HAVE_DECL_SETHOSTNAME''@|1|g' \
-      -e 's|@''HAVE_DECL_TRUNCATE''@|1|g' \
-      -e 's|@''HAVE_DECL_TTYNAME_R''@|1|g' \
-      -e 's|@''HAVE_OS_H''@|0|g' \
-      -e 's|@''HAVE_SYS_PARAM_H''@|0|g' \
-      < unistd.h-t2 > unistd.h-t3
-rm -f stdio.h-t1 stdio.h-t2
-mv pthread.h-t4 pthread.h
-mv stdio.h-t3 stdio.h
+mv wchar.h-t3 wchar.h
 rm -f stdlib.h-t1 stdlib.h-t2
-sed \
-      -e 's|@''REPLACE_MBSTATE_T''@|0|g' \
-      -e 's|@''REPLACE_BTOWC''@|0|g' \
-      -e 's|@''REPLACE_WCTOB''@|0|g' \
-      -e 's|@''REPLACE_FREE''@|0|g' \
-      -e 's|@''REPLACE_MBSINIT''@|0|g' \
-      -e 's|@''REPLACE_MBRTOWC''@|0|g' \
-      -e 's|@''REPLACE_MBRLEN''@|0|g' \
-      -e 's|@''REPLACE_MBSRTOWCS''@|0|g' \
-      -e 's|@''REPLACE_MBSNRTOWCS''@|0|g' \
-      -e 's|@''REPLACE_WCRTOMB''@|0|g' \
-      -e 's|@''REPLACE_WCSRTOMBS''@|0|g' \
-      -e 's|@''REPLACE_WCSNRTOMBS''@|0|g' \
-      -e 's|@''REPLACE_WCWIDTH''@|0|g' \
-      -e 's|@''REPLACE_WCSWIDTH''@|0|g' \
-      -e 's|@''REPLACE_WCSFTIME''@|0|g' \
-      -e 's|@''REPLACE_WCSCMP''@|0|g' \
-      -e 's|@''REPLACE_WCSNCAT''@|0|g' \
-      -e 's|@''REPLACE_WCSNCMP''@|0|g' \
-      -e 's|@''REPLACE_WCSSTR''@|0|g' \
-      -e 's|@''REPLACE_WCSTOK''@|0|g' \
-      -e 's|@''REPLACE_WMEMCMP''@|0|g' \
-      -e 's|@''REPLACE_WMEMPCPY''@|0|g' \
-      -e '/definitions of _GL_FUNCDECL_RPL/r ./c++defs.h' \
-      -e '/definition of _GL_ARG_NONNULL/r ./arg-nonnull.h' \
-      -e '/definition of _GL_WARN_ON_USE/r ./warn-on-use.h' \
-      < wchar.h-t2 > wchar.h-t3
 mv stdlib.h-t3 stdlib.h
-rm -f wchar.h-t1 wchar.h-t2
-mv wchar.h-t3 wchar.h
+rm -f pthread.h-t1 pthread.h-t2 pthread.h-t3
+mv pthread.h-t4 pthread.h
 sed \
       -e 's|@''REPLACE_ACCESS''@|0|g' \
       -e 's|@''REPLACE_CHOWN''@|0|g' \
@@ -3028,7 +3064,7 @@
 make[2]: Leaving directory '/build/reproducible-path/lbzip2-2.5'
 make[1]: Leaving directory '/build/reproducible-path/lbzip2-2.5'
    dh_auto_test
-	make -j22 check "TESTSUITEFLAGS=-j22 --verbose" VERBOSE=1
+	make -j10 check "TESTSUITEFLAGS=-j10 --verbose" VERBOSE=1
 make[1]: Entering directory '/build/reproducible-path/lbzip2-2.5'
 Making check in lib
 make[2]: Entering directory '/build/reproducible-path/lbzip2-2.5/lib'
@@ -3060,21 +3096,21 @@
 make[4]: Entering directory '/build/reproducible-path/lbzip2-2.5/tests'
 PASS: crc2.bz2
 PASS: crc1.bz2
+PASS: cve2.bz2
 PASS: codelen20.bz2
 PASS: 32767.bz2
-PASS: cve.bz2
-PASS: concat.bz2
-PASS: cve2.bz2
 PASS: empty.bz2
-PASS: load0.bz2
+PASS: concat.bz2
+PASS: cve.bz2
 PASS: gap.bz2
 PASS: incomp-2.bz2
 PASS: incomp-1.bz2
 PASS: overrun.bz2
-PASS: void.bz2
 PASS: overrun2.bz2
 PASS: rand.bz2
+PASS: load0.bz2
 PASS: trash.bz2
+PASS: void.bz2
 PASS: repet.bz2
 PASS: fib.bz2
 PASS: ch255.bz2
@@ -3099,7 +3135,7 @@
    create-stamp debian/debhelper-build-stamp
    dh_prep
    dh_auto_install --destdir=debian/lbzip2/
-	make -j22 install DESTDIR=/build/reproducible-path/lbzip2-2.5/debian/lbzip2 AM_UPDATE_INFO_DIR=no
+	make -j10 install DESTDIR=/build/reproducible-path/lbzip2-2.5/debian/lbzip2 AM_UPDATE_INFO_DIR=no
 make[1]: Entering directory '/build/reproducible-path/lbzip2-2.5'
 Making install in lib
 make[2]: Entering directory '/build/reproducible-path/lbzip2-2.5/lib'
@@ -3171,12 +3207,14 @@
 dpkg-buildpackage: info: binary-only upload (no source included)
 dpkg-genchanges: info: not including original source code in upload
 I: copying local configuration
+I: user script /srv/workspace/pbuilder/32809/tmp/hooks/B01_cleanup starting
+I: user script /srv/workspace/pbuilder/32809/tmp/hooks/B01_cleanup finished
 I: unmounting dev/ptmx filesystem
 I: unmounting dev/pts filesystem
 I: unmounting dev/shm filesystem
 I: unmounting proc filesystem
 I: unmounting sys filesystem
 I: cleaning the build env 
-I: removing directory /srv/workspace/pbuilder/74722 and its subdirectories
-I: Current time: Sun Feb 22 20:42:41 -12 2026
-I: pbuilder-time-stamp: 1771836161
+I: removing directory /srv/workspace/pbuilder/32809 and its subdirectories
+I: Current time: Tue Jan 21 16:22:31 +14 2025
+I: pbuilder-time-stamp: 1737426151