commit 585d9286816baa082424dad214c24817718d802d
parent cfff46e0f6180d925fe0f5b06a5e7439d67875cf
Author: Jan Pobrislo <ccx@te2000.cz>
Date: Thu, 18 Dec 2025 20:24:48 +0000
libelf: use CPPFLAGS
Diffstat:
15 files changed, 28 insertions(+), 25 deletions(-)
diff --git a/templates/pkg/libelf b/templates/pkg/libelf
@@ -14,6 +14,7 @@ build_env_static
DESTDIR="$pthbs_destdir" \
INCDIR="$prefix/{{includedir}}" \
LIBDIR="$prefix/{{libdir}}" \
+ CFLAGS="$CPPFLAGS $CFLAGS" \
install-static
mkdir -p "${dest}/{{pkgconfigdir}}"
diff --git a/variants/ccx-x86_64/busybox:modutils b/variants/ccx-x86_64/busybox:modutils
@@ -1,5 +1,5 @@
#!/usr/bin/env pthbs-build
-#+linux-qemu-guest.8815d78c8b0fc32feca9bc0942e8aea8d0faed8c263a8907481d36692b330a59
+#+linux-qemu-guest.94ae1b9f26f5be4dab2c834063db96f1c1738b13dca57ca3d7f27433486d32c3
#+musl-cross-make.4bca2cd43f4a72eaaeefc4befc0b0ce736a5906ec0245552a8db7dc56fa9e5ec
#+gnu-make.fb4cff1c46827d02016d0f94d5256a263e7710025f7480fffb7580dc922a6069
#+busybox.504428034e649f598212c8994966e36667178683ec90987355f495ad3ca4abac
@@ -60,7 +60,7 @@ export CFLAGS="-D_GNU_SOURCE"
export LDFLAGS="-static"
# TODO: indirection via deps directory/symlink
cat >>.config <<EOF
-CONFIG_DEFAULT_MODULES_DIR="/home/ccx/versions/linux-qemu-guest.8815d78c8b0fc32feca9bc0942e8aea8d0faed8c263a8907481d36692b330a59"
+CONFIG_DEFAULT_MODULES_DIR="/home/ccx/versions/linux-qemu-guest.94ae1b9f26f5be4dab2c834063db96f1c1738b13dca57ca3d7f27433486d32c3"
EOF
make oldconfig
cat .config
diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment
@@ -88,9 +88,9 @@
#+squashfs-tools.e58b08a6012ee3dc4429378aaaf55f620da924cf444b3556520fc4e6efb10946
#+mandoc.f9203b401ae6346801b1e100da2e79879b24b86f7f31c457fb4add63cf1ed170
#+tinyssh.9940616c43114ecd7767fc10062ce00eb76a738453248a490f64cd79854343d7
-#+system-config.e1e6decd74fe2e6c2e1acb7cfbe8eb1d92c4d9f4f5795f4de013a46771b1d16a
-#+system-config-rc.30055510e484dd4a29a35f0fb2b92ea97a96c0619c6d11bfb2f31635fedf610d
+#+system-config.16fd9f365e1bd19e990a7fc0d6833454a21f2dfb438c212f664aa9b7782c5b2c
+#+system-config-rc.dc2f1cec95914d1701c3de257ddf6e4717232bd7cc14b53ff1e8ec02f710d4c2
#+system-config-scripts.35c642cad58c3945c2c3caa525fce3946ba87d0710adaf13efec1db79da75729
-#+system-config-init.f155333bee7682c84b527019c80f13d4971beb1489b3704dcb7fb6eb790bbb0c
+#+system-config-init.58a112e911ec2e4e3774d3f0128090834a11440632419b72a6a8c3bf63ec10d0
#+system-config-zsh.a8d29ac3c60ef9b666edf51a0bfd60aee2be60f3aa898ed8285afd8c2955baab
-#+busybox.fbc9e803b04255dbb1331b834390250bc68a686d02ae51a5537b781cac049cf5-
\ No newline at end of file
+#+busybox.aea69a6a1ec89241b2fd65771f228ede99e7184ee9a34e97af68423d27117348+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/kernel.environment b/variants/ccx-x86_64/kernel.environment
@@ -1,3 +1,3 @@
#!/usr/bin/env pthbs-build
-#+linux-qemu-guest.8815d78c8b0fc32feca9bc0942e8aea8d0faed8c263a8907481d36692b330a59
-#+busybox.fbc9e803b04255dbb1331b834390250bc68a686d02ae51a5537b781cac049cf5-
\ No newline at end of file
+#+linux-qemu-guest.94ae1b9f26f5be4dab2c834063db96f1c1738b13dca57ca3d7f27433486d32c3
+#+busybox.aea69a6a1ec89241b2fd65771f228ede99e7184ee9a34e97af68423d27117348+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/libelf b/variants/ccx-x86_64/libelf
@@ -52,6 +52,7 @@ make -j${JOBS:-1} -l$((1+${JOBS:-1})) PREFIX="$prefix" \
DESTDIR="$pthbs_destdir" \
INCDIR="$prefix/include" \
LIBDIR="$prefix/library" \
+ CFLAGS="$CPPFLAGS $CFLAGS" \
install-static
mkdir -p "${dest}/library/pkgconfig"
diff --git a/variants/ccx-x86_64/linux b/variants/ccx-x86_64/linux
@@ -36,7 +36,7 @@
#+bison.101f9166d34a37221f88a74b20d14d9a10138f88e4b8195996de66d7fba93e2c
#+rsync.3060eb88668700798b531a6f6d3647352e1a572ad8f5b55a75fd22a3326de06a
#+zstd.1569c43f77b4031079e930f7eb6107e77b72dd641fac5228c4d2c784a6f15361
-#+libelf.224e9c567f7dcbae76ce03c2455b367874a4d5e34f64ee899cebb2375f126588
+#+libelf.744e554297f7156922dfe9796d38839734f76c515083c6052e22a4c64a8c7c21
#+pkgconf-pkg-config.e727e04fa14db15c16a52d4d389e55602d35b463dfe80b75d5120e383ec17ffb
#+nawk.ec8a7f9ea4618a151470a1c1a0026f688a5032eb06b8e459510fe82316c17a60
#@untar:-J:sha256:2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb:.
diff --git a/variants/ccx-x86_64/linux-qemu-guest b/variants/ccx-x86_64/linux-qemu-guest
@@ -36,7 +36,7 @@
#+bison.101f9166d34a37221f88a74b20d14d9a10138f88e4b8195996de66d7fba93e2c
#+rsync.3060eb88668700798b531a6f6d3647352e1a572ad8f5b55a75fd22a3326de06a
#+zstd.1569c43f77b4031079e930f7eb6107e77b72dd641fac5228c4d2c784a6f15361
-#+libelf.224e9c567f7dcbae76ce03c2455b367874a4d5e34f64ee899cebb2375f126588
+#+libelf.744e554297f7156922dfe9796d38839734f76c515083c6052e22a4c64a8c7c21
#+pkgconf-pkg-config.e727e04fa14db15c16a52d4d389e55602d35b463dfe80b75d5120e383ec17ffb
#+nawk.ec8a7f9ea4618a151470a1c1a0026f688a5032eb06b8e459510fe82316c17a60
#@untar:-J:sha256:7586962547803be7ecc4056efc927fb25214548722bd28171172f3599abb9764:.
diff --git a/variants/ccx-x86_64/mdevd.environment b/variants/ccx-x86_64/mdevd.environment
@@ -47,4 +47,4 @@
#+s6.8995e7d6191578e627f1a57d90c25a0e52d9afa701bbbe951f12494e5880351c
#+mdev-scripts.747ade0f721790e1ddbe4b7fae9578bba479d84303649a2e6cb1bb7a78d10836
#+mdevd.9e13a4a3ebe4ab99da1dc591d9646ec1287bfa575ee0845a154c8df885cdb17b
-#+busybox.fbc9e803b04255dbb1331b834390250bc68a686d02ae51a5537b781cac049cf5-
\ No newline at end of file
+#+busybox.aea69a6a1ec89241b2fd65771f228ede99e7184ee9a34e97af68423d27117348+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/system-config b/variants/ccx-x86_64/system-config
@@ -60,7 +60,7 @@
#+libcgroup.b965840ad051883db316a3df064f53b4562cddf8738dea3aa31a3464b23070c8
#+system-config-scripts.35c642cad58c3945c2c3caa525fce3946ba87d0710adaf13efec1db79da75729
#+logincaps.536680c06902322ead7c7241797739c630cb11fb4c62d45c991e9b5fa03666ce
-#+busybox.fbc9e803b04255dbb1331b834390250bc68a686d02ae51a5537b781cac049cf5
+#+busybox.aea69a6a1ec89241b2fd65771f228ede99e7184ee9a34e97af68423d27117348
#@git:055d24bac572481d7dedba7d4ec9df37f620fbfd:system-config
@@ -98,7 +98,7 @@ chmod +x config/etc/skel/loginexec
env 'pthbs_path_system-config'="$prefix" \
'pthbs_path_containers=/home/ccx/versions/env.f05f54d4495265058fef661758cdf245b71ea739962c657e65c5fc45adbc099a' \
- 'pthbs_path_mdevd=/home/ccx/versions/env.c9c201a2b517e3aacfc4709cf44a4c399ee28302bba620d332bfb90b04bebe92' \
+ 'pthbs_path_mdevd=/home/ccx/versions/env.573bdf8e058f17c8c28d0114414bf6b38879c6157460409cac78dfd7cf560b27' \
make -j${JOBS:-1} -l$((1+${JOBS:-1})) all
sort -u build/execfile | while IFS= read exename; do
diff --git a/variants/ccx-x86_64/system-config-init b/variants/ccx-x86_64/system-config-init
@@ -50,7 +50,7 @@
#+s6-portable-utils.ed9b2a1a2b2eade3f210e876b2e8c08d680c2fb0f4f5a1ec4137dd262a3d9e3d
#+s6-linux-init.7af048a1da88cb89e227afc4ce78f722cfde5a4bbe2f8fef1b1c4c37b1a12b8d
#+execline.403a4e1645c681e8c2ca9a75704a27658b788db460265916951d1d7a1e59ce8a
-#+system-config-rc.30055510e484dd4a29a35f0fb2b92ea97a96c0619c6d11bfb2f31635fedf610d
+#+system-config-rc.dc2f1cec95914d1701c3de257ddf6e4717232bd7cc14b53ff1e8ec02f710d4c2
# - build script start -
@@ -75,7 +75,7 @@ dest=${pthbs_destdir%/}${prefix}
cd '.'
-s6rcdb=/home/ccx/versions/system-config-rc.30055510e484dd4a29a35f0fb2b92ea97a96c0619c6d11bfb2f31635fedf610d/config/s6-rc-db
+s6rcdb=/home/ccx/versions/system-config-rc.dc2f1cec95914d1701c3de257ddf6e4717232bd7cc14b53ff1e8ec02f710d4c2/config/s6-rc-db
# Generate init (${dest} must not exist but parent dir does)
mkdir -p "$pthbs_destdir//home/ccx/versions"
diff --git a/variants/ccx-x86_64/system-config-rc b/variants/ccx-x86_64/system-config-rc
@@ -30,7 +30,7 @@
#+busybox-diffutils.eed6ca067c994ab56e63b8b97a60f6e9f3625d3f9aeda53306e23bb42186ce78
#+s6-rc.9aac5b15b54c183366ab03f193a967d0fc66134b1623410032766e062e77bc5d
#+fileset.a3b5845ff158d4a14da356583bcbbc7de921ea437f40d47d1f91d28549b384c0
-#+system-config.e1e6decd74fe2e6c2e1acb7cfbe8eb1d92c4d9f4f5795f4de013a46771b1d16a
+#+system-config.16fd9f365e1bd19e990a7fc0d6833454a21f2dfb438c212f664aa9b7782c5b2c
# - build script start -
@@ -40,7 +40,7 @@ dest=${pthbs_destdir%/}${prefix}
cd '.'
-src=/home/ccx/versions/system-config.e1e6decd74fe2e6c2e1acb7cfbe8eb1d92c4d9f4f5795f4de013a46771b1d16a/config/s6-rc-source
+src=/home/ccx/versions/system-config.16fd9f365e1bd19e990a7fc0d6833454a21f2dfb438c212f664aa9b7782c5b2c/config/s6-rc-source
s6-rc-compile ./s6-rc-db "$src"
mkdir -p "$dest/config"
mv -v s6-rc-db "$dest/config/"
diff --git a/variants/ccx-x86_64/vm.environment b/variants/ccx-x86_64/vm.environment
@@ -1,2 +1,2 @@
#!/usr/bin/env pthbs-build
-#+linux-qemu-guest.8815d78c8b0fc32feca9bc0942e8aea8d0faed8c263a8907481d36692b330a59-
\ No newline at end of file
+#+linux-qemu-guest.94ae1b9f26f5be4dab2c834063db96f1c1738b13dca57ca3d7f27433486d32c3+
\ No newline at end of file
diff --git a/variants/root-x86_64/libelf b/variants/root-x86_64/libelf
@@ -52,6 +52,7 @@ make -j${JOBS:-1} -l$((1+${JOBS:-1})) PREFIX="$prefix" \
DESTDIR="$pthbs_destdir" \
INCDIR="$prefix/include" \
LIBDIR="$prefix/library" \
+ CFLAGS="$CPPFLAGS $CFLAGS" \
install-static
mkdir -p "${dest}/library/pkgconfig"
diff --git a/variants/root-x86_64/linux-qemu-guest b/variants/root-x86_64/linux-qemu-guest
@@ -36,7 +36,7 @@
#+bison.183ae03f9de10534e919d4bd2bef1fa782b047f671fea90044796180284d38a7
#+rsync.0862e31de38b4a570ee619a737c7cd3f382d195dcfeee77fab3c00386fd8609b
#+zstd.b096b77421f338e2452668ae6faa2713158264b0378007a1c772d73ab2aefd52
-#+libelf.1bbdc5c3515c79e7805fee1627da1b6f31b95539e6ef2c7546e9647631dad29e
+#+libelf.26505a004da49c1196387fe32aa0e848ecdcf19b385212f632e9305d785c6480
#+pkgconf-pkg-config.c656966f2889c43d4e39921cc583813e6b7894db3754ea7af30d3361c7c40c63
#+nawk.84c186be0a6d09a951a8c6a5377d16b0ba0a9e476e6b554c0c832d6407ebb5b2
#@untar:-J:sha256:7586962547803be7ecc4056efc927fb25214548722bd28171172f3599abb9764:.
diff --git a/variants/root-x86_64/vm.environment b/variants/root-x86_64/vm.environment
@@ -1,2 +1,2 @@
#!/usr/bin/env pthbs-build
-#+linux-qemu-guest.32542044f387957576e1ca9f34438e2d8f22ae884add27537047958589fc7e96-
\ No newline at end of file
+#+linux-qemu-guest.cc471ee784aaa49c3bd3e54b66e2aa855541cd6a4b27ac978e9429c8da08a0b4+
\ No newline at end of file
