mrrl

commit 3e96696dff2c03919220039868210194b8617036
parent da927746ff2ccd5f07493ea27f39110a9a57de5c
Author: Jan Pobrislo <ccx@te2000.cz>
Date:   Sun,  4 May 2025 10:03:51 +0000

give build flags to the build command

Diffstat:
M
templates/pkg/linux
 | 
11
+++++------
M
variants/ccx-x86_64/kernel.environment
 | 
4
++--
M
variants/ccx-x86_64/linux
 | 
11
+++++------
M
variants/root-x86_64/kernel.environment
 | 
4
++--
M
variants/root-x86_64/linux
 | 
11
+++++------

5 files changed, 19 insertions(+), 22 deletions(-)
diff --git a/templates/pkg/linux b/templates/pkg/linux
@@ -14,25 +14,24 @@
 #@sha256:{{files["linux-6.1.34-x86_64-nossl.config"]}}:linux.config
 #@sha256:{{files["noobjtool.patch"]}}:noobjtool.patch
 
-export CFLAGS="-L$pthbs_build_environment/library -L$pthbs_build_environment/library.so"
-export LD_LIBRARY_PATH="$pthbs_build_environment/library:$pthbs_build_environment/library.so"
 export CPATH="$pthbs_build_environment/include"
 
 cd linux-6.1
 unxz -c < ../patch-6.1.34.xz | patch -p1 -N
 patch -p1 -N <../noobjtool.patch
 cp -v ../linux.config .config
-linux64 {{make}} olddefconfig
+linux64 make olddefconfig
 diff -u ../linux.config .config || true
-linux64 {{make}}
+linux64 {{make}} \
+	V=1 \
+	HOSTLDFLAGS="-static -L$pthbs_build_environment/library" \
+	HOSTCFLAGS="-L$pthbs_build_environment/library"
 
 installdir="$pthbs_destdir/{{versions}}/$pthbs_package"
 mkdir -p "$installdir/doc/linux" "$installdir/boot"
 cp -v .config "$installdir/config"
 mv Documentation/* "$installdir/doc/linux"
 linux64 make modules_install install \
-	V=1 \
-	HOSTLDFLAGS="-static -L$pthbs_build_environment/library" \
 	INSTALL_MOD_PATH="$installdir" \
 	INSTALL_MOD_STRIP=1 \
 	INSTALL_PATH="$installdir"/boot \
diff --git a/variants/ccx-x86_64/kernel.environment b/variants/ccx-x86_64/kernel.environment
@@ -1,2 +1,2 @@
 #!/usr/bin/env pthbs-build
-#+linux.917173ed1eac4227b2d313716336b64d9324020868bbc78b56f71f45717cf600-
\ No newline at end of file
+#+linux.2ed789dc5c6a7102b0c20a2ec016c0f55ab0bd627b5c9cbbbea6e50b6d985d0a+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/linux b/variants/ccx-x86_64/linux
@@ -13,25 +13,24 @@
 #@sha256:f33d82840d1db22114e18626b64922fa1a3b539a2dee6847528ecc1b17b7b659:linux.config
 #@sha256:ff3ddd131d73fee6838b11a6c4773bdb85c5f60fdd4b9ac4120ced021c341417:noobjtool.patch
 
-export CFLAGS="-L$pthbs_build_environment/library -L$pthbs_build_environment/library.so"
-export LD_LIBRARY_PATH="$pthbs_build_environment/library:$pthbs_build_environment/library.so"
 export CPATH="$pthbs_build_environment/include"
 
 cd linux-6.1
 unxz -c < ../patch-6.1.34.xz | patch -p1 -N
 patch -p1 -N <../noobjtool.patch
 cp -v ../linux.config .config
-linux64 make -j${JOBS:-1} -l$((1+${JOBS:-1})) olddefconfig
+linux64 make olddefconfig
 diff -u ../linux.config .config || true
-linux64 make -j${JOBS:-1} -l$((1+${JOBS:-1}))
+linux64 make -j${JOBS:-1} -l$((1+${JOBS:-1})) \
+	V=1 \
+	HOSTLDFLAGS="-static -L$pthbs_build_environment/library" \
+	HOSTCFLAGS="-L$pthbs_build_environment/library"
 
 installdir="$pthbs_destdir//home/ccx/versions/$pthbs_package"
 mkdir -p "$installdir/doc/linux" "$installdir/boot"
 cp -v .config "$installdir/config"
 mv Documentation/* "$installdir/doc/linux"
 linux64 make modules_install install \
-	V=1 \
-	HOSTLDFLAGS="-static -L$pthbs_build_environment/library" \
 	INSTALL_MOD_PATH="$installdir" \
 	INSTALL_MOD_STRIP=1 \
 	INSTALL_PATH="$installdir"/boot \
diff --git a/variants/root-x86_64/kernel.environment b/variants/root-x86_64/kernel.environment
@@ -1,2 +1,2 @@
 #!/usr/bin/env pthbs-build
-#+linux.34a51097b2a1870359cb70441a9403098f5f7b726149f8fd6e8c55794caf73bf-
\ No newline at end of file
+#+linux.c2697b00abb5e65c49915a929ad7b4784decc60d122dd0363269c4342b4e5d51+
\ No newline at end of file
diff --git a/variants/root-x86_64/linux b/variants/root-x86_64/linux
@@ -13,25 +13,24 @@
 #@sha256:f33d82840d1db22114e18626b64922fa1a3b539a2dee6847528ecc1b17b7b659:linux.config
 #@sha256:ff3ddd131d73fee6838b11a6c4773bdb85c5f60fdd4b9ac4120ced021c341417:noobjtool.patch
 
-export CFLAGS="-L$pthbs_build_environment/library -L$pthbs_build_environment/library.so"
-export LD_LIBRARY_PATH="$pthbs_build_environment/library:$pthbs_build_environment/library.so"
 export CPATH="$pthbs_build_environment/include"
 
 cd linux-6.1
 unxz -c < ../patch-6.1.34.xz | patch -p1 -N
 patch -p1 -N <../noobjtool.patch
 cp -v ../linux.config .config
-linux64 make -j${JOBS:-1} -l$((1+${JOBS:-1})) olddefconfig
+linux64 make olddefconfig
 diff -u ../linux.config .config || true
-linux64 make -j${JOBS:-1} -l$((1+${JOBS:-1}))
+linux64 make -j${JOBS:-1} -l$((1+${JOBS:-1})) \
+	V=1 \
+	HOSTLDFLAGS="-static -L$pthbs_build_environment/library" \
+	HOSTCFLAGS="-L$pthbs_build_environment/library"
 
 installdir="$pthbs_destdir//versions/$pthbs_package"
 mkdir -p "$installdir/doc/linux" "$installdir/boot"
 cp -v .config "$installdir/config"
 mv Documentation/* "$installdir/doc/linux"
 linux64 make modules_install install \
-	V=1 \
-	HOSTLDFLAGS="-static -L$pthbs_build_environment/library" \
 	INSTALL_MOD_PATH="$installdir" \
 	INSTALL_MOD_STRIP=1 \
 	INSTALL_PATH="$installdir"/boot \