+ case "${usergroup_phase}" in
+ local run_cmd
+ run_cmd=run_su
+ shift
+ run_su /opt/local/bin/bmake configure BATCH=1 DEPENDS_TARGET=/nonexistent PYTHON_VERSION_REQD=311 WRKLOG=/tmp/bulklog/rust-1.76.0nb3/work.log
+ su pbulk -c '"$@"' make /opt/local/bin/bmake configure BATCH=1 DEPENDS_TARGET=/nonexistent PYTHON_VERSION_REQD=311 WRKLOG=/tmp/bulklog/rust-1.76.0nb3/work.log
=> Bootstrap dependency digest>=20211023: found digest-20220214
=> Checksum BLAKE2s OK for rust-1.75.0-x86_64-unknown-illumos.tar.gz
=> Checksum SHA512 OK for rust-1.75.0-x86_64-unknown-illumos.tar.gz
=> Checksum BLAKE2s OK for rustc-1.76.0-src.tar.gz
=> Checksum SHA512 OK for rustc-1.76.0-src.tar.gz
===> Installing dependencies for rust-1.76.0nb3
==========================================================================
The supported build options for rust are:
rust-cargo-static rust-docs
You can select which build options to use by setting PKG_DEFAULT_OPTIONS
or the following variable. Its current value is shown:
PKG_OPTIONS.rust (not defined)
==========================================================================
==========================================================================
The following variables will affect the build process of this package,
rust-1.76.0nb3. Their current value is shown below:
* PYTHON_VERSION_DEFAULT = 311
* SSLBASE (defined)
* SSLCERTBUNDLE (not defined)
* SSLCERTS = /opt/local/etc/openssl/certs
* SSLDIR = /opt/local/etc/openssl
* SSLKEYS = /opt/local/etc/openssl/private
Based on these variables, the following variables have been set:
* PYPACKAGE = python311
You may want to abort the process now with CTRL-C and change the value
of variables in the first group before continuing. Be sure to run
`/opt/local/bin/bmake clean' after the changes.
==========================================================================
=> Tool dependency coreutils>=0: found coreutils-9.5
=> Tool dependency gzip>=0: found gzip-1.12
=> Tool dependency cmake-[0-9]*: found cmake-3.30.1
=> Tool dependency libtool-base>=2.4.2nb9: found libtool-base-2.4.7nb1
=> Tool dependency mktools-[0-9]*: found mktools-20220614
=> Tool dependency gmake>=3.81: found gmake-4.4.1
=> Tool dependency perl>=5.0: found perl-5.38.2
=> Tool dependency pkgconf-[0-9]*: found pkgconf-2.2.0nb1
=> Tool dependency cwrappers>=20150314: found cwrappers-20220403
=> Tool dependency checkperms>=1.1: found checkperms-1.12
=> Build dependency gcc13>=13.1.0: found gcc13-13.3.0
=> Build dependency python311>=3.11.0: found python311-3.11.9nb1
=> Full dependency curl>=8.7.1nb1: found curl-8.9.0
=> Full dependency gcc13-libs>=13.2.0: found gcc13-libs-13.3.0
=> Full dependency libunwind>=18.0.0: found libunwind-18.1.8
=> Full dependency llvm>=18.0.0: found llvm-18.1.8
=> Full dependency openssl>=3: found openssl-3.3.1
=> Full dependency zlib>=1.2.3: found zlib-1.3.1
===> Overriding tools for rust-1.76.0nb3
===> Extracting for rust-1.76.0nb3
set -e; if test -e /home/pbulk/build-disk/lang/rust176/work/rust-1.75.0-x86_64-unknown-illumos/install.sh -a ! -e /home/pbulk/build-disk/lang/rust176/work/rust-1.75.0-x86_64-unknown-illumos/bin/rustc; then cd /home/pbulk/build-disk/lang/rust176/work/rust-1.75.0-x86_64-unknown-illumos; env CARGO_BUILD_JOBS=1 LZMA_API_STATIC=1 USETOOLS=no DL_CFLAGS= DL_LDFLAGS= DL_LIBS= PTHREAD_CFLAGS=\ -pthread\ PTHREAD_LDFLAGS=\ -pthread PTHREAD_LIBS=-lpthread\ -lrt PTHREADBASE=/usr PYTHON=/opt/local/bin/python3.11 CC=gcc CFLAGS=-pipe\ -O2\ -msave-args\ -fno-aggressive-loop-optimizations\ -D_POSIX_PTHREAD_SEMANTICS\ -I/opt/local/include\ -DLDAP_DEPRECATED\ -I/usr/include\ -I/opt/local/include/python3.11 CPPFLAGS=-I/opt/local/include\ -DLDAP_DEPRECATED\ -I/usr/include\ -I/opt/local/include/python3.11 CXX=g++ CXXFLAGS=-pipe\ -O2\ -msave-args\ -fno-aggressive-loop-optimizations\ -D_POSIX_PTHREAD_SEMANTICS\ -I/opt/local/include\ -DLDAP_DEPRECATED\ -I/usr/include\ -I/opt/local/include/python3.11 COMPILER_RPATH_FLAG=-Wl,-R F77=gfortran FC=gfortran FFLAGS=-O LANG=C LC_ALL=C LC_COLLATE=C LC_CTYPE=C LC_MESSAGES=C LC_MONETARY=C LC_NUMERIC=C LC_TIME=C LDFLAGS=-L/opt/local/lib\ -Wl,-R/opt/local/lib\ -L/usr/lib/amd64\ -Wl,-R/usr/lib/amd64\ -liconv\ -lintl LINKER_RPATH_FLAG=-R PATH=/home/pbulk/build-disk/lang/rust176/work/.cwrapper/bin:/home/pbulk/build-disk/lang/rust176/work/.buildlink/bin:/home/pbulk/build-disk/lang/rust176/work/.gcc/bin:/home/pbulk/build-disk/lang/rust176/work/.tools/bin:/opt/local/bin:/sbin:/usr/sbin:/usr/bin:/opt/tools/bin:/opt/local/bin:/opt/local/bin PREFIX=/opt/local MAKELEVEL=0 CONFIG_SITE= ftp_proxy=downloads-forbidden-except-during-fetch http_proxy=downloads-forbidden-except-during-fetch https_proxy=downloads-forbidden-except-during-fetch no_proxy= PKG_SYSCONFDIR=/opt/local/etc HOME=/home/pbulk/build-disk/lang/rust176/work/.home CWRAPPERS_CONFIG_DIR=/home/pbulk/build-disk/lang/rust176/work/.cwrapper/config CPP=cpp LOCALBASE=/opt/local X11BASE=/opt/local PKGMANDIR=man PKGINFODIR=info PKGGNUDIR= MAKECONF=/dev/null OBJECT_FMT=ELF USETOOLS=no LIBTOOL="/home/pbulk/build-disk/lang/rust176/work/.cwrapper/bin/libtool " AR=gar BSD_INSTALL_PROGRAM=/opt/local/bin/bsdinstall\ -c\ \ -o\ pbulk\ -g\ pbulk\ -m\ 755 BSD_INSTALL_SCRIPT=/opt/local/bin/bsdinstall\ -c\ -o\ pbulk\ -g\ pbulk\ -m\ 755 BSD_INSTALL_LIB=/opt/local/bin/bsdinstall\ -c\ -o\ pbulk\ -g\ pbulk\ -m\ 755 BSD_INSTALL_DATA=/opt/local/bin/bsdinstall\ -c\ -o\ pbulk\ -g\ pbulk\ -m\ 644 BSD_INSTALL_MAN=/opt/local/bin/bsdinstall\ -c\ -o\ pbulk\ -g\ pbulk\ -m\ 644 BSD_INSTALL=/opt/local/bin/bsdinstall BSD_INSTALL_PROGRAM_DIR=/opt/local/bin/bsdinstall\ -d\ -o\ pbulk\ -g\ pbulk\ -m\ 755 BSD_INSTALL_SCRIPT_DIR=/opt/local/bin/bsdinstall\ -d\ -o\ pbulk\ -g\ pbulk\ -m\ 755 BSD_INSTALL_LIB_DIR=/opt/local/bin/bsdinstall\ -d\ -o\ pbulk\ -g\ pbulk\ -m\ 755 BSD_INSTALL_DATA_DIR=/opt/local/bin/bsdinstall\ -d\ -o\ pbulk\ -g\ pbulk\ -m\ 755 BSD_INSTALL_MAN_DIR=/opt/local/bin/bsdinstall\ -d\ -o\ pbulk\ -g\ pbulk\ -m\ 755 BSD_INSTALL_GAME=/opt/local/bin/bsdinstall\ -c\ \ -o\ pbulk\ -g\ pbulk\ -m\ 2555 BSD_INSTALL_GAME_DATA=/opt/local/bin/bsdinstall\ -c\ -o\ pbulk\ -g\ pbulk\ -m\ 664 BSD_INSTALL_GAME_DIR=/opt/local/bin/bsdinstall\ -d\ -o\ pbulk\ -g\ pbulk\ -m\ 775 INSTALL_INFO= MAKEINFO=/home/pbulk/build-disk/lang/rust176/work/.tools/bin/makeinfo FLEX= BISON= ITSTOOL=/home/pbulk/build-disk/lang/rust176/work/.tools/bin/itstool GDBUS_CODEGEN=/home/pbulk/build-disk/lang/rust176/work/.tools/bin/gdbus-codegen PKG_CONFIG=/home/pbulk/build-disk/lang/rust176/work/.tools/bin/pkg-config PKG_CONFIG_LIBDIR=/home/pbulk/build-disk/lang/rust176/work/.buildlink/lib/amd64/pkgconfig:/home/pbulk/build-disk/lang/rust176/work/.buildlink/lib/pkgconfig:/home/pbulk/build-disk/lang/rust176/work/.buildlink/share/pkgconfig PKG_CONFIG_LOG=/home/pbulk/build-disk/lang/rust176/work/.pkg-config.log PKG_CONFIG_PATH= CWRAPPERS_CONFIG_DIR=/home/pbulk/build-disk/lang/rust176/work/.cwrapper/config /bin/bash ./install.sh --prefix=/home/pbulk/build-disk/lang/rust176/work/rust-1.75.0-x86_64-unknown-illumos; cd /home/pbulk/build-disk/lang/rust176/work/rust-std-1.75.0-x86_64-unknown-illumos; env CARGO_BUILD_JOBS=1 LZMA_API_STATIC=1 USETOOLS=no DL_CFLAGS= DL_LDFLAGS= DL_LIBS= PTHREAD_CFLAGS=\ -pthread\ PTHREAD_LDFLAGS=\ -pthread PTHREAD_LIBS=-lpthread\ -lrt PTHREADBASE=/usr PYTHON=/opt/local/bin/python3.11 CC=gcc CFLAGS=-pipe\ -O2\ -msave-args\ -fno-aggressive-loop-optimizations\ -D_POSIX_PTHREAD_SEMANTICS\ -I/opt/local/include\ -DLDAP_DEPRECATED\ -I/usr/include\ -I/opt/local/include/python3.11 CPPFLAGS=-I/opt/local/include\ -DLDAP_DEPRECATED\ -I/usr/include\ -I/opt/local/include/python3.11 CXX=g++ CXXFLAGS=-pipe\ -O2\ -msave-args\ -fno-aggressive-loop-optimizations\ -D_POSIX_PTHREAD_SEMANTICS\ -I/opt/local/include\ -DLDAP_DEPRECATED\ -I/usr/include\ -I/opt/local/include/python3.11 COMPILER_RPATH_FLAG=-Wl,-R F77=gfortran FC=gfortran FFLAGS=-O LANG=C LC_ALL=C LC_COLLATE=C LC_CTYPE=C LC_MESSAGES=C LC_MONETARY=C LC_NUMERIC=C LC_TIME=C LDFLAGS=-L/opt/local/lib\ -Wl,-R/opt/local/lib\ -L/usr/lib/amd64\ -Wl,-R/usr/lib/amd64\ -liconv\ -lintl LINKER_RPATH_FLAG=-R PATH=/home/pbulk/build-disk/lang/rust176/work/.cwrapper/bin:/home/pbulk/build-disk/lang/rust176/work/.buildlink/bin:/home/pbulk/build-disk/lang/rust176/work/.gcc/bin:/home/pbulk/build-disk/lang/rust176/work/.tools/bin:/opt/local/bin:/sbin:/usr/sbin:/usr/bin:/opt/tools/bin:/opt/local/bin:/opt/local/bin PREFIX=/opt/local MAKELEVEL=0 CONFIG_SITE= ftp_proxy=downloads-forbidden-except-during-fetch http_proxy=downloads-forbidden-except-during-fetch https_proxy=downloads-forbidden-except-during-fetch no_proxy= PKG_SYSCONFDIR=/opt/local/etc HOME=/home/pbulk/build-disk/lang/rust176/work/.home CWRAPPERS_CONFIG_DIR=/home/pbulk/build-disk/lang/rust176/work/.cwrapper/config CPP=cpp LOCALBASE=/opt/local X11BASE=/opt/local PKGMANDIR=man PKGINFODIR=info PKGGNUDIR= MAKECONF=/dev/null OBJECT_FMT=ELF USETOOLS=no LIBTOOL="/home/pbulk/build-disk/lang/rust176/work/.cwrapper/bin/libtool " AR=gar BSD_INSTALL_PROGRAM=/opt/local/bin/bsdinstall\ -c\ \ -o\ pbulk\ -g\ pbulk\ -m\ 755 BSD_INSTALL_SCRIPT=/opt/local/bin/bsdinstall\ -c\ -o\ pbulk\ -g\ pbulk\ -m\ 755 BSD_INSTALL_LIB=/opt/local/bin/bsdinstall\ -c\ -o\ pbulk\ -g\ pbulk\ -m\ 755 BSD_INSTALL_DATA=/opt/local/bin/bsdinstall\ -c\ -o\ pbulk\ -g\ pbulk\ -m\ 644 BSD_INSTALL_MAN=/opt/local/bin/bsdinstall\ -c\ -o\ pbulk\ -g\ pbulk\ -m\ 644 BSD_INSTALL=/opt/local/bin/bsdinstall BSD_INSTALL_PROGRAM_DIR=/opt/local/bin/bsdinstall\ -d\ -o\ pbulk\ -g\ pbulk\ -m\ 755 BSD_INSTALL_SCRIPT_DIR=/opt/local/bin/bsdinstall\ -d\ -o\ pbulk\ -g\ pbulk\ -m\ 755 BSD_INSTALL_LIB_DIR=/opt/local/bin/bsdinstall\ -d\ -o\ pbulk\ -g\ pbulk\ -m\ 755 BSD_INSTALL_DATA_DIR=/opt/local/bin/bsdinstall\ -d\ -o\ pbulk\ -g\ pbulk\ -m\ 755 BSD_INSTALL_MAN_DIR=/opt/local/bin/bsdinstall\ -d\ -o\ pbulk\ -g\ pbulk\ -m\ 755 BSD_INSTALL_GAME=/opt/local/bin/bsdinstall\ -c\ \ -o\ pbulk\ -g\ pbulk\ -m\ 2555 BSD_INSTALL_GAME_DATA=/opt/local/bin/bsdinstall\ -c\ -o\ pbulk\ -g\ pbulk\ -m\ 664 BSD_INSTALL_GAME_DIR=/opt/local/bin/bsdinstall\ -d\ -o\ pbulk\ -g\ pbulk\ -m\ 775 INSTALL_INFO= MAKEINFO=/home/pbulk/build-disk/lang/rust176/work/.tools/bin/makeinfo FLEX= BISON= ITSTOOL=/home/pbulk/build-disk/lang/rust176/work/.tools/bin/itstool GDBUS_CODEGEN=/home/pbulk/build-disk/lang/rust176/work/.tools/bin/gdbus-codegen PKG_CONFIG=/home/pbulk/build-disk/lang/rust176/work/.tools/bin/pkg-config PKG_CONFIG_LIBDIR=/home/pbulk/build-disk/lang/rust176/work/.buildlink/lib/amd64/pkgconfig:/home/pbulk/build-disk/lang/rust176/work/.buildlink/lib/pkgconfig:/home/pbulk/build-disk/lang/rust176/work/.buildlink/share/pkgconfig PKG_CONFIG_LOG=/home/pbulk/build-disk/lang/rust176/work/.pkg-config.log PKG_CONFIG_PATH= CWRAPPERS_CONFIG_DIR=/home/pbulk/build-disk/lang/rust176/work/.cwrapper/config /bin/bash ./install.sh --prefix=/home/pbulk/build-disk/lang/rust176/work/rust-1.75.0-x86_64-unknown-illumos; fi
===> Patching for rust-1.76.0nb3
=> Applying pkgsrc patches for rust-1.76.0nb3
=> Verifying /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-compiler_rustc__codegen__ssa_src_back_linker.rs
=> Applying pkgsrc patch /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-compiler_rustc__codegen__ssa_src_back_linker.rs
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-compiler_rustc__codegen__ssa_src_back_linker.rs,v 1.1 2024/07/07 10:41:20 wiz Exp $
|
|Do not use @rpath on Darwin.
|Find external libunwind on Linux.
|
|--- compiler/rustc_codegen_ssa/src/back/linker.rs.orig 2024-04-18 08:34:17.044783799 +0000
|+++ compiler/rustc_codegen_ssa/src/back/linker.rs
--------------------------
Patching file compiler/rustc_codegen_ssa/src/back/linker.rs using Plan A...
Hunk #1 succeeded at 312.
Hunk #2 succeeded at 462.
done
=> Verifying /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-compiler_rustc__llvm_build.rs
=> Applying pkgsrc patch /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-compiler_rustc__llvm_build.rs
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-compiler_rustc__llvm_build.rs,v 1.1 2024/07/07 10:41:20 wiz Exp $
|
|Fix build on NetBSD HEAD-llvm. XXX there is probably a better way to do this.
|
|Pick up -latomic tweak from
|https://github.com/rust-lang/rust/issues/104220
|and
|https://github.com/rust-lang/rust/pull/104572
|
|--- compiler/rustc_llvm/build.rs.orig 2023-10-03 02:52:17.000000000 +0000
|+++ compiler/rustc_llvm/build.rs
--------------------------
Patching file compiler/rustc_llvm/build.rs using Plan A...
Hunk #1 succeeded at 255 (offset 6 lines).
Hunk #2 succeeded at 271 (offset 6 lines).
Hunk #3 succeeded at 366 (offset 6 lines).
done
=> Verifying /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-compiler_rustc__target_src_spec_base_netbsd.rs
=> Applying pkgsrc patch /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-compiler_rustc__target_src_spec_base_netbsd.rs
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-compiler_rustc__target_src_spec_base_netbsd.rs,v 1.1 2024/07/07 10:41:20 wiz Exp $
|
|For the benefit of powerpc, when libatomic-links is installed,
|search the directory containing the symlinks to -latomic.
|
|--- compiler/rustc_target/src/spec/base/netbsd.rs.orig 2024-01-06 19:57:14.887897867 +0000
|+++ compiler/rustc_target/src/spec/base/netbsd.rs
--------------------------
Patching file compiler/rustc_target/src/spec/base/netbsd.rs using Plan A...
Hunk #1 succeeded at 1.
done
=> Verifying /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-compiler_rustc__target_src_spec_mod.rs
=> Applying pkgsrc patch /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-compiler_rustc__target_src_spec_mod.rs
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-compiler_rustc__target_src_spec_mod.rs,v 1.1 2024/07/07 10:41:20 wiz Exp $
|
|Add entry for NetBSD/mips64el.
|
|--- compiler/rustc_target/src/spec/mod.rs.orig 2024-01-13 14:20:59.236278792 +0000
|+++ compiler/rustc_target/src/spec/mod.rs
--------------------------
Patching file compiler/rustc_target/src/spec/mod.rs using Plan A...
Hunk #1 succeeded at 1531 (offset -1 lines).
done
=> Verifying /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-compiler_rustc__target_src_spec_targets_i586__unknown__netbsd.rs
=> Applying pkgsrc patch /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-compiler_rustc__target_src_spec_targets_i586__unknown__netbsd.rs
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-compiler_rustc__target_src_spec_targets_i586__unknown__netbsd.rs,v 1.1 2024/07/07 10:41:21 wiz Exp $
|
|Change to Inline stack probing, as suggested by
|https://github.com/rust-lang/rust/pull/120411
|
|--- compiler/rustc_target/src/spec/targets/i586_unknown_netbsd.rs.orig 2024-02-26 11:56:11.087253310 +0000
|+++ compiler/rustc_target/src/spec/targets/i586_unknown_netbsd.rs
--------------------------
Patching file compiler/rustc_target/src/spec/targets/i586_unknown_netbsd.rs using Plan A...
Hunk #1 succeeded at 4.
done
=> Verifying /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-compiler_rustc__target_src_spec_targets_mips64el__unknown__netbsd.rs
=> Applying pkgsrc patch /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-compiler_rustc__target_src_spec_targets_mips64el__unknown__netbsd.rs
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-compiler_rustc__target_src_spec_targets_mips64el__unknown__netbsd.rs,v 1.1 2024/07/07 10:41:21 wiz Exp $
|
|Provide a mips64el target with N32, suitable for NetBSD/mips64el.
|
|--- compiler/rustc_target/src/spec/targets/mips64el_unknown_netbsd.rs.orig 2024-01-13 14:16:30.122042614 +0000
|+++ compiler/rustc_target/src/spec/targets/mips64el_unknown_netbsd.rs
--------------------------
(Creating file compiler/rustc_target/src/spec/targets/mips64el_unknown_netbsd.rs...)
Patching file compiler/rustc_target/src/spec/targets/mips64el_unknown_netbsd.rs using Plan A...
Empty context always matches.
Hunk #1 succeeded at 1.
done
=> Verifying /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-library_backtrace_src_symbolize_gimli.rs
=> Applying pkgsrc patch /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-library_backtrace_src_symbolize_gimli.rs
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-library_backtrace_src_symbolize_gimli.rs,v 1.1 2024/07/07 10:41:21 wiz Exp $
|
|Add NetBSD to the family who is in the unix class.
|
|--- library/backtrace/src/symbolize/gimli.rs.orig 2022-04-04 09:41:26.000000000 +0000
|+++ library/backtrace/src/symbolize/gimli.rs
--------------------------
Patching file library/backtrace/src/symbolize/gimli.rs using Plan A...
Hunk #1 succeeded at 39 (offset 1 line).
done
=> Verifying /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-library_backtrace_src_symbolize_gimli_elf.rs
=> Applying pkgsrc patch /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-library_backtrace_src_symbolize_gimli_elf.rs
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-library_backtrace_src_symbolize_gimli_elf.rs,v 1.1 2024/07/07 10:41:21 wiz Exp $
|
|Make NetBSD also find its debug libraries, if present.
|
|--- library/backtrace/src/symbolize/gimli/elf.rs.orig 2022-04-04 09:41:26.000000000 +0000
|+++ library/backtrace/src/symbolize/gimli/elf.rs
--------------------------
Patching file library/backtrace/src/symbolize/gimli/elf.rs using Plan A...
Hunk #1 succeeded at 304.
done
=> Verifying /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-library_std_src_sys_unix_mod.rs
=> Applying pkgsrc patch /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-library_std_src_sys_unix_mod.rs
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-library_std_src_sys_unix_mod.rs,v 1.1 2024/07/07 10:41:21 wiz Exp $
|
|Add libexecinfo for backtrace() on NetBSD.
|
|--- library/std/src/sys/unix/mod.rs.orig 2021-02-10 17:36:44.000000000 +0000
|+++ library/std/src/sys/unix/mod.rs
--------------------------
Patching file library/std/src/sys/unix/mod.rs using Plan A...
Hunk #1 succeeded at 387 (offset 118 lines).
done
=> Verifying /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-library_std_src_sys_unix_thread.rs
=> Applying pkgsrc patch /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-library_std_src_sys_unix_thread.rs
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-library_std_src_sys_unix_thread.rs,v 1.1 2024/07/07 10:41:21 wiz Exp $
|
|Fix stack-clash on SunOS.
|
|Undo new(ish) code (from 1.72.0) which attempts to count threads/CPUs
|on NetBSD; somehow it is causing crashes in bootstrap() on certain
|CPU architectures (i386, powerpc, armv7, but not riscv64, aarch64
|or amd64); _cpuset_isset() crashes with SEGV. And according to
|what I hear, the code is bogus; by default threads do not have
|affinity to any specific set of CPUs in NetBSD, and trying to
|replicate this with a simple C program always results in 0.
|So rip the newish code out with prejudice, and instead fallback to
|the sysctl() method of getting "number of CPUs" which was used
|before (and is still present, following the ripped-out code).
|
|--- library/std/src/sys/unix/thread.rs.orig 2020-10-07 07:53:22.000000000 +0000
|+++ library/std/src/sys/unix/thread.rs
--------------------------
Patching file library/std/src/sys/unix/thread.rs using Plan A...
Hunk #1 succeeded at 376 (offset 24 lines).
Hunk #2 succeeded at 792 (offset 3 lines).
done
=> Verifying /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-library_std_src_sys_unix_thread__parking_netbsd.rs
=> Applying pkgsrc patch /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-library_std_src_sys_unix_thread__parking_netbsd.rs
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-library_std_src_sys_unix_thread__parking_netbsd.rs,v 1.1 2024/07/07 10:41:21 wiz Exp $
|
|Try to cast to make this build, to avoid
|
|error[E0277]: the trait bound `i32: core::convert::From<u32>` is not satisfied
| --> library/std/src/sys/unix/thread_parking/netbsd.rs:37:37
| |
|37 | tv_nsec: dur.subsec_nanos().into(),
| | ^^^^ the trait `core::convert::From<u32>` is not implemented for `i32`
| |
| = help: the following other types implement trait `core::convert::From<T>`:
| <i32 as core::convert::From<NonZeroI32>>
| <i32 as core::convert::From<bool>>
| <i32 as core::convert::From<i16>>
| <i32 as core::convert::From<i8>>
| <i32 as core::convert::From<u16>>
| <i32 as core::convert::From<u8>>
| = note: required for `u32` to implement `core::convert::Into<i32>`
|
|For more information about this error, try `rustc --explain E0277`.
|
|This to un-break the 32-bit ports ... again.
|
|--- library/std/src/sys/unix/thread_parking/netbsd.rs.orig 2023-03-06 15:58:58.000000000 +0000
|+++ library/std/src/sys/unix/thread_parking/netbsd.rs
--------------------------
Patching file library/std/src/sys/unix/thread_parking/netbsd.rs using Plan A...
Hunk #1 succeeded at 34.
done
=> Verifying /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-src_bootstrap_bootstrap.py
=> Applying pkgsrc patch /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-src_bootstrap_bootstrap.py
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-src_bootstrap_bootstrap.py,v 1.1 2024/07/07 10:41:21 wiz Exp $
|
|Use `uname -p` on NetBSD, as that is reliable and sensible there.
|Handle earmv[67]hf for NetBSD.
|Also use @PREFIX@ and not $ORIGIN in rpath.
|
|--- src/bootstrap/bootstrap.py.orig 2023-07-12 03:32:40.000000000 +0000
|+++ src/bootstrap/bootstrap.py
--------------------------
Patching file src/bootstrap/bootstrap.py using Plan A...
Hunk #1 succeeded at 271.
Hunk #2 succeeded at 379.
Hunk #3 succeeded at 730 (offset -16 lines).
done
=> Verifying /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-src_bootstrap_src_core_build__steps_compile.rs
=> Applying pkgsrc patch /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-src_bootstrap_src_core_build__steps_compile.rs
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-src_bootstrap_src_core_build__steps_compile.rs,v 1.1 2024/07/07 10:41:21 wiz Exp $
|
|On Darwin, do not use @rpath for internal libraries.
|
|--- src/bootstrap/src/core/build_steps/compile.rs.orig 2024-01-06 20:42:20.028206400 +0000
|+++ src/bootstrap/src/core/build_steps/compile.rs
--------------------------
Patching file src/bootstrap/src/core/build_steps/compile.rs using Plan A...
Hunk #1 succeeded at 628 (offset 2 lines).
done
=> Verifying /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-src_bootstrap_src_core_builder.rs
=> Applying pkgsrc patch /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-src_bootstrap_src_core_builder.rs
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-src_bootstrap_src_core_builder.rs,v 1.1 2024/07/07 10:41:21 wiz Exp $
|
|Use @PREFIX@, not $ORIGIN in rpath.
|Find external libunwind on Linux.
|
|--- src/bootstrap/src/core/builder.rs.orig 2024-04-18 09:00:07.530512451 +0000
|+++ src/bootstrap/src/core/builder.rs
--------------------------
Patching file src/bootstrap/src/core/builder.rs using Plan A...
Hunk #1 succeeded at 1687.
Hunk #2 succeeded at 2130.
done
=> Verifying /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-src_bootstrap_src_lib.rs
=> Applying pkgsrc patch /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-src_bootstrap_src_lib.rs
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-src_bootstrap_src_lib.rs,v 1.1 2024/07/07 10:41:21 wiz Exp $
|
|Don't filter out optimization flags.
|FreeBSD has a particular C++ runtime library name
|
|--- src/bootstrap/src/lib.rs.orig 2024-01-06 20:52:50.892941220 +0000
|+++ src/bootstrap/src/lib.rs
--------------------------
Patching file src/bootstrap/src/lib.rs using Plan A...
Hunk #1 succeeded at 1187 (offset -8 lines).
done
=> Verifying /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-src_llvm-project_llvm_CMakeLists.txt
=> Applying pkgsrc patch /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-src_llvm-project_llvm_CMakeLists.txt
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-src_llvm-project_llvm_CMakeLists.txt,v 1.1 2024/07/07 10:41:21 wiz Exp $
|
|Don't implement sys/regset.h workaround, fix source instead.
|
|--- src/llvm-project/llvm/CMakeLists.txt.orig 2018-03-10 02:51:13.000000000 +0000
|+++ src/llvm-project/llvm/CMakeLists.txt
--------------------------
Patching file src/llvm-project/llvm/CMakeLists.txt using Plan A...
Hunk #1 succeeded at 1111 (offset 172 lines).
done
=> Verifying /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake
=> Applying pkgsrc patch /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake,v 1.1 2024/07/07 10:41:21 wiz Exp $
|
|On Darwin, use correct install-name for shared libraries.
|
|Undo some of the RPATH magic so that cross-building
|works inside pkgsrc again (indirectly eliminates $ORIGIN rpath
|handling / editing, $ORIGIN handling is partially undone by cwrappers
|in pkgsrc).
|
|--- src/llvm-project/llvm/cmake/modules/AddLLVM.cmake.orig 2023-07-12 03:33:01.000000000 +0000
|+++ src/llvm-project/llvm/cmake/modules/AddLLVM.cmake
--------------------------
Patching file src/llvm-project/llvm/cmake/modules/AddLLVM.cmake using Plan A...
Hunk #1 succeeded at 2343 (offset 32 lines).
Hunk #2 succeeded at 2352 (offset 32 lines).
Hunk #3 succeeded at 2366 (offset 32 lines).
done
=> Verifying /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-src_llvm-project_llvm_include_llvm-c_DataTypes.h
=> Applying pkgsrc patch /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-src_llvm-project_llvm_include_llvm-c_DataTypes.h
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-src_llvm-project_llvm_include_llvm-c_DataTypes.h,v 1.1 2024/07/07 10:41:21 wiz Exp $
|
|Don't implement sys/regset.h workaround, fix source instead.
|
|--- src/llvm-project/llvm/include/llvm-c/DataTypes.h.orig 2021-04-17 01:50:37.000000000 +0000
|+++ src/llvm-project/llvm/include/llvm-c/DataTypes.h
--------------------------
Patching file src/llvm-project/llvm/include/llvm-c/DataTypes.h using Plan A...
Hunk #1 succeeded at 77.
done
=> Verifying /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-src_llvm-project_llvm_include_llvm_Analysis_ConstantFolding.h
=> Applying pkgsrc patch /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-src_llvm-project_llvm_include_llvm_Analysis_ConstantFolding.h
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-src_llvm-project_llvm_include_llvm_Analysis_ConstantFolding.h,v 1.1 2024/07/07 10:41:21 wiz Exp $
|
|Fix SunOS CS conflict not handled by include/llvm-c/DataTypes.h
|
|--- src/llvm-project/llvm/include/llvm/Analysis/ConstantFolding.h.orig 2018-08-01 16:32:37.000000000 +0000
|+++ src/llvm-project/llvm/include/llvm/Analysis/ConstantFolding.h
--------------------------
Patching file src/llvm-project/llvm/include/llvm/Analysis/ConstantFolding.h using Plan A...
Hunk #1 succeeded at 19.
done
=> Verifying /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-src_llvm-project_llvm_lib_Support_BLAKE3_blake3__impl.h
=> Applying pkgsrc patch /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-src_llvm-project_llvm_lib_Support_BLAKE3_blake3__impl.h
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-src_llvm-project_llvm_lib_Support_BLAKE3_blake3__impl.h,v 1.1 2024/07/07 10:41:21 wiz Exp $
|
|Do not try to use neon on big-endian aarch64, as we have
|an #error waiting there.
|
|--- src/llvm-project/llvm/lib/Support/BLAKE3/blake3_impl.h.orig 2022-09-02 08:17:54.000000000 +0000
|+++ src/llvm-project/llvm/lib/Support/BLAKE3/blake3_impl.h
--------------------------
Patching file src/llvm-project/llvm/lib/Support/BLAKE3/blake3_impl.h using Plan A...
Hunk #1 succeeded at 56 (offset -8 lines).
done
=> Verifying /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-src_llvm-project_llvm_utils_FileCheck_FileCheck.cpp
=> Applying pkgsrc patch /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-src_llvm-project_llvm_utils_FileCheck_FileCheck.cpp
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-src_llvm-project_llvm_utils_FileCheck_FileCheck.cpp,v 1.1 2024/07/07 10:41:21 wiz Exp $
|
|Avoid ambiguous function call.
|
|--- src/llvm-project/llvm/utils/FileCheck/FileCheck.cpp.orig 2019-02-12 15:22:48.000000000 +0000
|+++ src/llvm-project/llvm/utils/FileCheck/FileCheck.cpp
--------------------------
Patching file src/llvm-project/llvm/utils/FileCheck/FileCheck.cpp using Plan A...
Hunk #1 succeeded at 595 (offset 3 lines).
done
=> Verifying /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-src_tools_cargo_src_cargo_core_profiles.rs
=> Applying pkgsrc patch /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-src_tools_cargo_src_cargo_core_profiles.rs
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-src_tools_cargo_src_cargo_core_profiles.rs,v 1.1 2024/07/07 10:41:21 wiz Exp $
|
|Turn off incremental builds for sparc64, ref.
|https://sources.debian.org/patches/cargo/0.29.0-1/2007_sparc64_disable_incremental_build.patch/
|
|--- src/tools/cargo/src/cargo/core/profiles.rs.orig 2023-07-12 03:33:05.000000000 +0000
|+++ src/tools/cargo/src/cargo/core/profiles.rs
--------------------------
Patching file src/tools/cargo/src/cargo/core/profiles.rs using Plan A...
Hunk #1 succeeded at 703 (offset 22 lines).
done
=> Verifying /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-src_tools_cargo_tests_testsuite_build.rs
=> Applying pkgsrc patch /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-src_tools_cargo_tests_testsuite_build.rs
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-src_tools_cargo_tests_testsuite_build.rs,v 1.1 2024/07/07 10:41:21 wiz Exp $
|
|Don't attempt incremental operations on sparc64, ref.
|https://sources.debian.org/patches/cargo/0.29.0-1/2007_sparc64_disable_incremental_build.patch/
|
|--- src/tools/cargo/tests/testsuite/build.rs.orig 2019-08-13 06:27:40.000000000 +0000
|+++ src/tools/cargo/tests/testsuite/build.rs
--------------------------
Patching file src/tools/cargo/tests/testsuite/build.rs using Plan A...
Hunk #1 succeeded at 47.
Hunk #2 succeeded at 70.
Hunk #3 succeeded at 113.
done
=> Verifying /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-src_tools_rust-installer_install-template.sh
=> Applying pkgsrc patch /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-src_tools_rust-installer_install-template.sh
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-src_tools_rust-installer_install-template.sh,v 1.1 2024/07/07 10:41:21 wiz Exp $
|
|No logging to 'install.log'.
|Do not create 'uninstall.sh'.
|Do not make file backups (filename.old), so these will not end up in the final package.
|
|Rewrite to not use a whole lot of subprocesses just for doing
|pattern matching and substitution in the install phase using "grep"
|and "sed" when shell builtin "case" and "omit shortest match" ops
|should do just fine.
|
|--- src/tools/rust-installer/install-template.sh.orig 2023-12-21 16:55:28.000000000 +0000
|+++ src/tools/rust-installer/install-template.sh
--------------------------
Patching file src/tools/rust-installer/install-template.sh using Plan A...
Hunk #1 succeeded at 6.
Hunk #2 succeeded at 425.
Hunk #3 succeeded at 533.
Hunk #4 succeeded at 543.
Hunk #5 succeeded at 571.
Hunk #6 succeeded at 598.
Hunk #7 succeeded at 620.
Hunk #8 succeeded at 968.
done
=> Verifying /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-vendor_aho-corasick_src_packed_teddy_builder.rs
=> Applying pkgsrc patch /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-vendor_aho-corasick_src_packed_teddy_builder.rs
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-vendor_aho-corasick_src_packed_teddy_builder.rs,v 1.1 2024/07/07 10:41:21 wiz Exp $
|
|--- vendor/aho-corasick/src/packed/teddy/builder.rs.orig 2024-02-18 10:54:27.960401196 +0000
|+++ vendor/aho-corasick/src/packed/teddy/builder.rs
--------------------------
Patching file vendor/aho-corasick/src/packed/teddy/builder.rs using Plan A...
Hunk #1 succeeded at 230.
Hunk #2 succeeded at 301.
Hunk #3 succeeded at 705.
done
=> Verifying /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-vendor_aho-corasick_src_packed_vector.rs
=> Applying pkgsrc patch /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-vendor_aho-corasick_src_packed_vector.rs
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-vendor_aho-corasick_src_packed_vector.rs,v 1.1 2024/07/07 10:41:21 wiz Exp $
|
|--- vendor/aho-corasick/src/packed/vector.rs.orig 2024-02-18 10:12:16.371081231 +0000
|+++ vendor/aho-corasick/src/packed/vector.rs
--------------------------
Patching file vendor/aho-corasick/src/packed/vector.rs using Plan A...
Hunk #1 succeeded at 595.
done
=> Verifying /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-vendor_backtrace_src_symbolize_gimli.rs
=> Applying pkgsrc patch /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-vendor_backtrace_src_symbolize_gimli.rs
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-vendor_backtrace_src_symbolize_gimli.rs,v 1.1 2024/07/07 10:41:21 wiz Exp $
|
|Do mmap on NetBSD as well.
|
|--- ./vendor/backtrace/src/symbolize/gimli.rs.orig 2022-04-04 11:10:55.000000000 +0000
|+++ ./vendor/backtrace/src/symbolize/gimli.rs
--------------------------
Patching file ./vendor/backtrace/src/symbolize/gimli.rs using Plan A...
Hunk #1 succeeded at 38.
done
=> Verifying /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-vendor_backtrace_src_symbolize_gimli_elf.rs
=> Applying pkgsrc patch /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-vendor_backtrace_src_symbolize_gimli_elf.rs
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-vendor_backtrace_src_symbolize_gimli_elf.rs,v 1.1 2024/07/07 10:41:21 wiz Exp $
|
|Make NetBSD also find its debug libraries, if present.
|
|--- vendor/backtrace/src/symbolize/gimli/elf.rs.orig 2022-04-04 11:10:55.000000000 +0000
|+++ vendor/backtrace/src/symbolize/gimli/elf.rs
--------------------------
Patching file vendor/backtrace/src/symbolize/gimli/elf.rs using Plan A...
Hunk #1 succeeded at 304 (offset 28 lines).
done
=> Verifying /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-vendor_cc-1.0.73_src_lib.rs
=> Applying pkgsrc patch /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-vendor_cc-1.0.73_src_lib.rs
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-vendor_cc-1.0.73_src_lib.rs,v 1.1 2024/07/07 10:41:21 wiz Exp $
|
|Use correct ABI on NetBSD/riscv64.
|
|--- vendor/cc-1.0.73/src/lib.rs.orig 2023-05-31 21:44:47.000000000 +0000
|+++ vendor/cc-1.0.73/src/lib.rs
--------------------------
Patching file vendor/cc-1.0.73/src/lib.rs using Plan A...
Hunk #1 succeeded at 1830.
done
=> Verifying /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-vendor_cc_src_lib.rs
=> Applying pkgsrc patch /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-vendor_cc_src_lib.rs
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-vendor_cc_src_lib.rs,v 1.1 2024/07/07 10:41:21 wiz Exp $
|
|Add aarch64_be and mipsel for NetBSD.
|
|--- vendor/cc/src/lib.rs.orig 2024-02-17 11:28:27.283394955 +0000
|+++ vendor/cc/src/lib.rs
--------------------------
Patching file vendor/cc/src/lib.rs using Plan A...
Hunk #1 succeeded at 3058.
Hunk #2 succeeded at 3094.
done
=> Verifying /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-vendor_crossbeam-epoch_no__atomic.rs
=> Applying pkgsrc patch /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-vendor_crossbeam-epoch_no__atomic.rs
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-vendor_crossbeam-epoch_no__atomic.rs,v 1.1 2024/07/07 10:41:21 wiz Exp $
|
|Add "mipsel-unknown-netbsd" to the list who don't have
|native 64-bit atomic ops.
|Unify with crossbeam-epoch to get same after-checksum...
|
|--- vendor/crossbeam-epoch/no_atomic.rs.orig 2023-07-12 05:06:31.000000000 +0000
|+++ vendor/crossbeam-epoch/no_atomic.rs
--------------------------
Patching file vendor/crossbeam-epoch/no_atomic.rs using Plan A...
Hunk #1 succeeded at 33 (offset -5 lines).
done
=> Verifying /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-vendor_crossbeam-utils-0.8.14-no__atomic.rs
=> Applying pkgsrc patch /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-vendor_crossbeam-utils-0.8.14-no__atomic.rs
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-vendor_crossbeam-utils-0.8.14-no__atomic.rs,v 1.1 2024/07/07 10:41:21 wiz Exp $
|
|No 64-bit atomics on NetBSD/mipsel.
|
|--- vendor/crossbeam-utils-0.8.14/no_atomic.rs.orig 2023-07-12 05:06:31.000000000 +0000
|+++ vendor/crossbeam-utils-0.8.14/no_atomic.rs
--------------------------
Patching file vendor/crossbeam-utils-0.8.14/no_atomic.rs using Plan A...
Hunk #1 succeeded at 41.
done
=> Verifying /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-vendor_crossbeam-utils_no__atomic.rs
=> Applying pkgsrc patch /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-vendor_crossbeam-utils_no__atomic.rs
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-vendor_crossbeam-utils_no__atomic.rs,v 1.1 2024/07/07 10:41:21 wiz Exp $
|
|Add mipsel-unknown-netbsd target as not having 64-bit atomics.
|Unify with crossbeam-utils-0.8.12 by removing mipsel-sony-psx.
|
|--- vendor/crossbeam-utils/no_atomic.rs.orig 2023-07-12 05:06:31.000000000 +0000
|+++ vendor/crossbeam-utils/no_atomic.rs
--------------------------
Patching file vendor/crossbeam-utils/no_atomic.rs using Plan A...
Hunk #1 succeeded at 33 (offset -5 lines).
done
=> Verifying /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-vendor_libc-0.2.148_src_unix_bsd_netbsdlike+netbsd_mips.rs
=> Applying pkgsrc patch /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-vendor_libc-0.2.148_src_unix_bsd_netbsdlike+netbsd_mips.rs
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-vendor_libc-0.2.148_src_unix_bsd_netbsdlike+netbsd_mips.rs,v 1.1 2024/07/07 10:41:21 wiz Exp $
|
|Add entry for NetBSD/mips.
|
|--- vendor/libc-0.2.148/src/unix/bsd/netbsdlike/netbsd/mips.rs.orig 2024-01-06 21:03:21.781003759 +0000
|+++ vendor/libc-0.2.148/src/unix/bsd/netbsdlike/netbsd/mips.rs 2024-01-06 22:27:31.830676317 +0000
--------------------------
(Creating file vendor/libc-0.2.148/src/unix/bsd/netbsdlike/netbsd/mips.rs...)
Patching file vendor/libc-0.2.148/src/unix/bsd/netbsdlike/netbsd/mips.rs using Plan A...
Empty context always matches.
Hunk #1 succeeded at 1.
done
=> Verifying /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-vendor_libc-0.2.148_src_unix_bsd_netbsdlike_netbsd_mod.rs
=> Applying pkgsrc patch /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-vendor_libc-0.2.148_src_unix_bsd_netbsdlike_netbsd_mod.rs
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-vendor_libc-0.2.148_src_unix_bsd_netbsdlike_netbsd_mod.rs,v 1.1 2024/07/07 10:41:21 wiz Exp $
|
|Add entries for execinfo, and support
|for NetBSD/mips and NetBSD/riscv64.
|
|--- vendor/libc-0.2.148/src/unix/bsd/netbsdlike/netbsd/mod.rs.orig 2024-01-06 22:33:33.911876204 +0000
|+++ vendor/libc-0.2.148/src/unix/bsd/netbsdlike/netbsd/mod.rs
--------------------------
Patching file vendor/libc-0.2.148/src/unix/bsd/netbsdlike/netbsd/mod.rs using Plan A...
Hunk #1 succeeded at 10.
Hunk #2 succeeded at 3153.
Hunk #3 succeeded at 3188.
done
=> Verifying /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-vendor_libc-0.2.148_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
=> Applying pkgsrc patch /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-vendor_libc-0.2.148_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-vendor_libc-0.2.148_src_unix_bsd_netbsdlike_netbsd_riscv64.rs,v 1.1 2024/07/07 10:41:22 wiz Exp $
|
|Add support for NetBSD/riscv64.
|
|--- vendor/libc-0.2.148/src/unix/bsd/netbsdlike/netbsd/riscv64.rs.orig 2024-01-06 21:03:21.781003759 +0000
|+++ vendor/libc-0.2.148/src/unix/bsd/netbsdlike/netbsd/riscv64.rs 2024-01-06 22:31:25.289387359 +0000
--------------------------
(Creating file vendor/libc-0.2.148/src/unix/bsd/netbsdlike/netbsd/riscv64.rs...)
Patching file vendor/libc-0.2.148/src/unix/bsd/netbsdlike/netbsd/riscv64.rs using Plan A...
Empty context always matches.
Hunk #1 succeeded at 1.
done
=> Verifying /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-vendor_libc-0.2.148_src_unix_solarish_mod.rs
=> Applying pkgsrc patch /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-vendor_libc-0.2.148_src_unix_solarish_mod.rs
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-vendor_libc-0.2.148_src_unix_solarish_mod.rs,v 1.1 2024/07/07 10:41:22 wiz Exp $
|
|Fix xattr build.
|
|--- vendor/libc-0.2.148/src/unix/solarish/mod.rs.orig 2024-01-06 22:41:58.182128108 +0000
|+++ vendor/libc-0.2.148/src/unix/solarish/mod.rs
--------------------------
Patching file vendor/libc-0.2.148/src/unix/solarish/mod.rs using Plan A...
Hunk #1 succeeded at 1523.
done
=> Verifying /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-vendor_libc_src_unix_solarish_mod.rs
=> Applying pkgsrc patch /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-vendor_libc_src_unix_solarish_mod.rs
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-vendor_libc_src_unix_solarish_mod.rs,v 1.1 2024/07/07 10:41:22 wiz Exp $
|
|Fix xattr build.
|
|--- vendor/libc/src/unix/solarish/mod.rs.orig 2019-05-20 13:47:24.000000000 +0000
|+++ vendor/libc/src/unix/solarish/mod.rs
--------------------------
Patching file vendor/libc/src/unix/solarish/mod.rs using Plan A...
Hunk #1 succeeded at 1523.
done
=> Verifying /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-vendor_lzma-sys_config.h
=> Applying pkgsrc patch /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-vendor_lzma-sys_config.h
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-vendor_lzma-sys_config.h,v 1.1 2024/07/07 10:41:22 wiz Exp $
|
|Fix SunOS builds with newer compilers.
|
|--- vendor/lzma-sys/config.h.orig 2020-10-07 09:33:31.000000000 +0000
|+++ vendor/lzma-sys/config.h
--------------------------
Patching file vendor/lzma-sys/config.h using Plan A...
Hunk #1 succeeded at 35.
done
=> Verifying /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-vendor_nix-0.26.2_src_sys_signal.rs
=> Applying pkgsrc patch /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-vendor_nix-0.26.2_src_sys_signal.rs
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-vendor_nix-0.26.2_src_sys_signal.rs,v 1.1 2024/07/07 10:41:22 wiz Exp $
|
|Narrow the conditional on mips to only apply to Linux.
|
|--- vendor/nix-0.26.2/src/sys/signal.rs.orig 2024-02-18 16:20:52.047002882 +0000
|+++ vendor/nix-0.26.2/src/sys/signal.rs
--------------------------
Patching file vendor/nix-0.26.2/src/sys/signal.rs using Plan A...
Hunk #1 succeeded at 1069.
done
=> Verifying /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-vendor_openssl-src_openssl_Configurations_10-main.conf
=> Applying pkgsrc patch /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-vendor_openssl-src_openssl_Configurations_10-main.conf
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-vendor_openssl-src_openssl_Configurations_10-main.conf,v 1.1 2024/07/07 10:41:22 wiz Exp $
|
|Replicate part of
|https://github.com/openssl/openssl/pull/15086
|
|--- vendor/openssl-src/openssl/Configurations/10-main.conf.orig 2023-08-03 13:47:25.000000000 +0000
|+++ vendor/openssl-src/openssl/Configurations/10-main.conf
--------------------------
Patching file vendor/openssl-src/openssl/Configurations/10-main.conf using Plan A...
Hunk #1 succeeded at 950.
done
=> Verifying /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-vendor_openssl-src_src_lib.rs
=> Applying pkgsrc patch /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-vendor_openssl-src_src_lib.rs
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-vendor_openssl-src_src_lib.rs,v 1.1 2024/07/07 10:41:22 wiz Exp $
|
|Provide defaults for the various NetBSD targets.
|
|--- vendor/openssl-src/src/lib.rs.orig 2024-02-04 14:52:05.000000000 +0000
|+++ vendor/openssl-src/src/lib.rs
--------------------------
Patching file vendor/openssl-src/src/lib.rs using Plan A...
Hunk #1 succeeded at 239.
Hunk #2 succeeded at 251.
Hunk #3 succeeded at 269.
Hunk #4 succeeded at 279.
Hunk #5 succeeded at 291.
done
=> Verifying /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-vendor_openssl-sys_build_find__normal.rs
=> Applying pkgsrc patch /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-vendor_openssl-sys_build_find__normal.rs
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-vendor_openssl-sys_build_find__normal.rs,v 1.1 2024/07/07 10:41:22 wiz Exp $
|
|Add hack for Darwin when homebrew is installed.
|
|--- vendor/openssl-sys/build/find_normal.rs.orig 2023-05-31 21:44:49.000000000 +0000
|+++ vendor/openssl-sys/build/find_normal.rs
--------------------------
Patching file vendor/openssl-sys/build/find_normal.rs using Plan A...
Hunk #1 succeeded at 72.
done
=> Verifying /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-vendor_openssl-sys_build_main.rs
=> Applying pkgsrc patch /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-vendor_openssl-sys_build_main.rs
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-vendor_openssl-sys_build_main.rs,v 1.1 2024/07/07 10:41:22 wiz Exp $
|
|Patterned after Linux and Android, on 32-bit NetBSD ports
|include -latomic. Parts of this inspired by
|https://github.com/sfackler/rust-openssl/commit/a0a1d1d29263abb7c47fc2e58cef8dab13762a45
|
|--- vendor/openssl-sys/build/main.rs.orig 2022-11-02 16:21:42.000000000 +0000
|+++ vendor/openssl-sys/build/main.rs
--------------------------
Patching file vendor/openssl-sys/build/main.rs using Plan A...
Hunk #1 succeeded at 115 (offset -7 lines).
done
=> Verifying /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-vendor_rustc-ap-rustc__target_src_spec_aarch64__be__unknown__netbsd.rs
=> Applying pkgsrc patch /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-vendor_rustc-ap-rustc__target_src_spec_aarch64__be__unknown__netbsd.rs
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-vendor_rustc-ap-rustc__target_src_spec_aarch64__be__unknown__netbsd.rs,v 1.1 2024/07/07 10:41:22 wiz Exp $
|
|Add aarch64_be NetBSD target.
|
|--- /dev/null 2021-04-26 00:02:43.147970692 +0200
|+++ vendor/rustc-ap-rustc_target/src/spec/aarch64_be_unknown_netbsd.rs 2021-04-26 00:07:44.657579025 +0200
--------------------------
(Creating file vendor/rustc-ap-rustc_target/src/spec/aarch64_be_unknown_netbsd.rs...)
Patching file vendor/rustc-ap-rustc_target/src/spec/aarch64_be_unknown_netbsd.rs using Plan A...
Empty context always matches.
Hunk #1 succeeded at 1.
done
=> Verifying /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-vendor_stacker_src_lib.rs
=> Applying pkgsrc patch /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-vendor_stacker_src_lib.rs
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-vendor_stacker_src_lib.rs,v 1.1 2024/07/07 10:41:22 wiz Exp $
|
|Avoid missing pthread_* on older SunOS.
|
|--- vendor/stacker/src/lib.rs.orig 2020-07-13 18:18:17.000000000 +0000
|+++ vendor/stacker/src/lib.rs
--------------------------
Patching file vendor/stacker/src/lib.rs using Plan A...
Hunk #1 succeeded at 409 (offset 2 lines).
done
=> Verifying /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-vendor_target-lexicon_src_targets.rs
=> Applying pkgsrc patch /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-vendor_target-lexicon_src_targets.rs
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-vendor_target-lexicon_src_targets.rs,v 1.1 2024/07/07 10:41:22 wiz Exp $
|
|Add aarch64_eb and mipsel for NetBSD.
|
|--- vendor/target-lexicon/src/targets.rs.orig 2021-05-03 21:35:46.000000000 +0000
|+++ vendor/target-lexicon/src/targets.rs
--------------------------
Patching file vendor/target-lexicon/src/targets.rs using Plan A...
Hunk #1 succeeded at 1526.
Hunk #2 succeeded at 1612.
done
=> Verifying /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-vendor_valuable_no__atomic.rs
=> Applying pkgsrc patch /data/jenkins/workspace/pkgsrc-trunk-x86_64/lang/rust176/patches/patch-vendor_valuable_no__atomic.rs
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$NetBSD: patch-vendor_valuable_no__atomic.rs,v 1.1 2024/07/07 10:41:22 wiz Exp $
|
|Add mipsel-unknown-netbsd.
|
|--- vendor/valuable/no_atomic.rs.orig 2022-09-19 15:35:03.000000000 +0000
|+++ vendor/valuable/no_atomic.rs
--------------------------
Patching file vendor/valuable/no_atomic.rs using Plan A...
Hunk #1 succeeded at 30.
done
===> Creating toolchain wrappers for rust-1.76.0nb3
===> Configuring for rust-1.76.0nb3
=> Substituting "cksum" in vendor/libc/.cargo-checksum.json vendor/cc-1.0.73/.cargo-checksum.json vendor/cc/.cargo-checksum.json vendor/lzma-sys/.cargo-checksum.json vendor/stacker/.cargo-checksum.json vendor/crossbeam-utils/.cargo-checksum.json vendor/crossbeam-utils-0.8.14/.cargo-checksum.json vendor/crossbeam-epoch/.cargo-checksum.json vendor/openssl-sys/.cargo-checksum.json vendor/openssl-src/.cargo-checksum.json vendor/nix-0.26.2/.cargo-checksum.json vendor/aho-corasick/.cargo-checksum.json
=> Substituting "prefix" in compiler/rustc_codegen_ssa/src/back/linker.rs compiler/rustc_target/src/spec/base/netbsd.rs src/bootstrap/src/core/build_steps/compile.rs src/bootstrap/src/core/builder.rs src/bootstrap/bootstrap.py
=> Checking for portability problems in extracted files
configure: processing command line
configure:
configure: build.configure-args := ['--prefix=/opt/local', '--mandir=/opt/local/m ...
configure: install.prefix := /opt/local
configure: install.mandir := /opt/local/man
configure: install.sysconfdir := /opt/local/etc
configure: build.python := /opt/local/bin/python3.11
configure: rust.channel := stable
configure: build.rustc := /home/pbulk/build-disk/lang/rust176/work/rust- ...
configure: build.cargo := /home/pbulk/build-disk/lang/rust176/work/rust- ...
configure: build.extended := True
configure: rust.rpath := True
configure: rust.codegen-tests := False
configure: build.compiler-docs := False
configure: llvm.static-libstdcpp := False
configure: llvm.ninja := False
configure: dist.compression-formats := ['xz']
configure: build.vendor := True
configure: target.x86_64-unknown-illumos.llvm-config := /opt/local/bin/llvm-confi ...
configure: build.build := x86_64-unknown-illumos
configure: build.host := ['x86_64-unknown-illumos']
configure: build.target := ['x86_64-unknown-illumos']
configure: llvm.link-shared := True
configure: rust.llvm-libunwind := system
configure: target.x86_64-unknown-illumos.llvm-config := /opt/local/bin/llvm-confi ...
configure: build.docs := False
configure: profile := dist
configure:
configure: writing `config.toml` in current directory
configure:
configure: run `python /home/pbulk/build-disk/lang/rust176/work/rustc-1.76.0-src/x.py --help`
=> Modifying libtool scripts to use pkgsrc libtool
=> Modifying libtool scripts to use pkgsrc depcomp