test (2fb921bd) · Commits · jan.koester / blogi

packaging/build-nspawn.sh

+71 −7

Original line number	Diff line number	Diff line
		@@ -262,6 +262,14 @@ setup_toolchain() {
		"
		fi

		# Ensure loader path used by musl-linked binaries exists even on incremental runs.
		systemd-nspawn -D "$CHROOT_DIR" --pipe -- bash -c '
		set -e
		if [ -f /usr/local/musl/lib/libc.so ]; then
		ln -sf /usr/local/musl/lib/libc.so /lib/ld-musl-x86_64.so.1
		fi
		'

		# ── Phase 2b-2: Generate wrapper compilers + toolchain file (always, cheap) ──
		echo "==> Generating compiler wrappers and toolchain file..."

		@@ -523,7 +531,7 @@ build_libraries() {
		exit 1
		fi
		if [ -z "\$ICUPKG_BIN" ] \|\| [ ! -x "\$ICUPKG_BIN" ]; then
		echo "FATAL: detected icupkg path is invalid: \$ICUPKG_BIN" >&2
		echo \"FATAL: detected icupkg path is invalid: \$ICUPKG_BIN\" >&2
		exit 1
		fi
		ln -sf "\$ICUPKG_BIN" /usr/local/bin/icupkg
		@@ -532,7 +540,12 @@ build_libraries() {
		export CXX=/usr/local/musl/bin/musl-clang++
		export AR=llvm-ar-${LLVM_VERSION}
		export RANLIB=llvm-ranlib-${LLVM_VERSION}
		export CC_host=clang-${LLVM_VERSION}
		export CXX_host=clang++-${LLVM_VERSION}
		export AR_host=llvm-ar-${LLVM_VERSION}
		export RANLIB_host=llvm-ranlib-${LLVM_VERSION}
		export PATH=\$PREFIX/icu-host/bin:\$PREFIX/icu-host/sbin:\$PATH
		export LD_LIBRARY_PATH=\$PREFIX/icu-host/lib:\$PREFIX/icu-host/lib64:/usr/local/lib:\${LD_LIBRARY_PATH:-}
		export ICU_PKG=/usr/local/bin/icupkg
		./configure --prefix=\$PREFIX --without-npm
		mkdir -p out/Release
		@@ -542,7 +555,30 @@ build_libraries() {
		echo \"FATAL: failed to stage out/Release/icupkg for node build\" >&2
		exit 1
		fi
		make -j\$(nproc)

		# Node's ICU build step expects a host genccode at out/Release/genccode.
		GENCCODE_BIN=
		for c in \
		\$PREFIX/icu-host/bin/genccode \
		\$PREFIX/icu-host/sbin/genccode \
		/build/libs/icu/icu4c/source/build-host/bin/genccode
		do
		if [ -x \"\$c\" ]; then
		GENCCODE_BIN=\"\$c\"
		break
		fi
		done
		if [ -z \"\$GENCCODE_BIN\" ]; then
		echo \"FATAL: genccode is not available for node build\" >&2
		exit 1
		fi
		rm -f out/Release/genccode
		install -m 0755 \"\$GENCCODE_BIN\" out/Release/genccode
		if [ ! -x out/Release/genccode ]; then
		echo \"FATAL: failed to stage out/Release/genccode for node build\" >&2
		exit 1
		fi
		make -j1
		make install
		ln -sf /usr/local/bin/node /usr/local/bin/nodejs
		cd /build/libs
		@@ -718,11 +754,11 @@ update_libraries() {
		mkdir -p build-host && cd build-host
		../configure --prefix=\$PREFIX/icu-host
		make -j\$(nproc)
		if [ -z "\$ICUPKG_BIN" ] \|\| [ ! -x "\$ICUPKG_BIN" ]; then
		echo "FATAL: detected icupkg path is invalid: \$ICUPKG_BIN" >&2
		make install
		ICUPKG_BIN=
		for c in \
		\$PREFIX/icu-host/bin/icupkg \
		\$PREFIX/icu-host/sbin/icupkg \
		ln -sf "\$ICUPKG_BIN" /usr/local/bin/icupkg
		/build/libs/icu/icu4c/source/build-host/bin/icupkg
		do
		if [ -x "\$c" ]; then
		@@ -732,7 +768,7 @@ update_libraries() {
		done
		if [ -z "\$ICUPKG_BIN" ]; then
		echo \"FATAL: icupkg was not built by ICU\" >&2
		install -m 0755 "\$ICUPKG_BIN" out/Release/icupkg
		exit 1
		fi
		ln -sf "\$ICUPKG_BIN" /usr/local/bin/icupkg
		touch /build/libs/.icu-tools.done
		@@ -774,7 +810,12 @@ update_libraries() {
		export CXX=/usr/local/musl/bin/musl-clang++
		export AR=llvm-ar-${LLVM_VERSION}
		export RANLIB=llvm-ranlib-${LLVM_VERSION}
		export CC_host=clang-${LLVM_VERSION}
		export CXX_host=clang++-${LLVM_VERSION}
		export AR_host=llvm-ar-${LLVM_VERSION}
		export RANLIB_host=llvm-ranlib-${LLVM_VERSION}
		export PATH=\$PREFIX/icu-host/bin:\$PREFIX/icu-host/sbin:\$PATH
		export LD_LIBRARY_PATH=\$PREFIX/icu-host/lib:\$PREFIX/icu-host/lib64:/usr/local/lib:\${LD_LIBRARY_PATH:-}
		export ICU_PKG=/usr/local/bin/icupkg
		./configure --prefix=\$PREFIX --without-npm
		mkdir -p out/Release
		@@ -784,7 +825,30 @@ update_libraries() {
		echo \"FATAL: failed to stage out/Release/icupkg for node build\" >&2
		exit 1
		fi
		make -j\$(nproc)

		# Node's ICU build step expects a host genccode at out/Release/genccode.
		GENCCODE_BIN=
		for c in \
		\$PREFIX/icu-host/bin/genccode \
		\$PREFIX/icu-host/sbin/genccode \
		/build/libs/icu/icu4c/source/build-host/bin/genccode
		do
		if [ -x \"\$c\" ]; then
		GENCCODE_BIN=\"\$c\"
		break
		fi
		done
		if [ -z \"\$GENCCODE_BIN\" ]; then
		echo \"FATAL: genccode is not available for node build\" >&2
		exit 1
		fi
		rm -f out/Release/genccode
		install -m 0755 \"\$GENCCODE_BIN\" out/Release/genccode
		if [ ! -x out/Release/genccode ]; then
		echo \"FATAL: failed to stage out/Release/genccode for node build\" >&2
		exit 1
		fi
		make -j1
		make install
		ln -sf /usr/local/bin/node /usr/local/bin/nodejs
		touch /build/libs/.nodejs.done