mrrl

commit 28eccaaa7f677bf19bc65e2a6da6512c08764b8c
parent 3e96696dff2c03919220039868210194b8617036
Author: Jan Pobrislo <ccx@te2000.cz>
Date:   Sun,  4 May 2025 11:01:49 +0000

Add pkg-config file for libelf

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

8 files changed, 66 insertions(+), 9 deletions(-)
diff --git a/templates/pkg/libelf b/templates/pkg/libelf
@@ -11,14 +11,31 @@
 prefix={{versions}}/$pthbs_package
 build_env_static
 cd {{name}}
-{{make}} PREFIX={{versions}}/$pthbs_package \
+{{make}} PREFIX="$prefix" \
 	DESTDIR="$pthbs_destdir" \
 	INCDIR="$prefix/include" \
 	LIBDIR="$prefix/library" \
 	install-static
+
+mkdir -p "$pthbs_destdir/${prefix#/}/library/pkgconfig"
+printf '%s\n' > "$pthbs_destdir/${prefix#/}/library/pkgconfig/libelf.pc" \
+	"prefix={{versions}}/$pthbs_package" \
+	'exec_prefix=${prefix}' \
+	'includedir=${prefix}/include' \
+	'libdir=${exec_prefix}/library' \
+	'' \
+	'Name: libelf' \
+	'Description: standalone libelf' \
+	'Version: 0.193' \
+	'' \
+	'Requires:' \
+	'Libs: -L${libdir} -lz -lzstd' \
+	'Cflags: -I${includedir}'
+
 {% endblock %}
 {% block genlinks_begin %}
 	x["./library/libelf.a"]=1
+	x["./library/pkgconfig/libelf.pc"]=1
 	x["./include/libelf.h"]=1
 	x["./include/gelf.h"]=1
 	x["./include/nlist.h"]=1
diff --git a/templates/pkg/linux b/templates/pkg/linux
@@ -8,7 +8,9 @@
 #+{{pkg_install_name("flex")}}
 #+{{pkg_install_name("bison")}}
 #+{{pkg_install_name("rsync")}}
+#+{{pkg_install_name("zstd")}}
 #+{{pkg_install_name("libelf")}}
+#+{{pkg_install_name("pkgconf-pkg-config")}}
 #@untar:-J:sha256:2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb:.
 #@sha256:d9b01e4dac3dd140c394227603c8b3339bb2f1e10c97afd3607d84e3003ec75a:patch-6.1.34.xz
 #@sha256:{{files["linux-6.1.34-x86_64-nossl.config"]}}:linux.config
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.2ed789dc5c6a7102b0c20a2ec016c0f55ab0bd627b5c9cbbbea6e50b6d985d0a-
\ No newline at end of file
+#+linux.f7401ffc600ebc422370b902873ba97b94703e9b4f52db65a22ff09265f31268+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/libelf b/variants/ccx-x86_64/libelf
@@ -14,16 +14,33 @@ build_env_static() {
 prefix=/home/ccx/versions/$pthbs_package
 build_env_static
 cd libelf
-make -j${JOBS:-1} -l$((1+${JOBS:-1})) PREFIX=/home/ccx/versions/$pthbs_package \
+make -j${JOBS:-1} -l$((1+${JOBS:-1})) PREFIX="$prefix" \
 	DESTDIR="$pthbs_destdir" \
 	INCDIR="$prefix/include" \
 	LIBDIR="$prefix/library" \
 	install-static
 
+mkdir -p "$pthbs_destdir/${prefix#/}/library/pkgconfig"
+printf '%s\n' > "$pthbs_destdir/${prefix#/}/library/pkgconfig/libelf.pc" \
+	"prefix=/home/ccx/versions/$pthbs_package" \
+	'exec_prefix=${prefix}' \
+	'includedir=${prefix}/include' \
+	'libdir=${exec_prefix}/library' \
+	'' \
+	'Name: libelf' \
+	'Description: standalone libelf' \
+	'Version: 0.193' \
+	'' \
+	'Requires:' \
+	'Libs: -L${libdir} -lz -lzstd' \
+	'Cflags: -I${includedir}'
+
+
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 find -type d -o -print | awk -F/ '
 BEGIN {
 	x["./library/libelf.a"]=1
+	x["./library/pkgconfig/libelf.pc"]=1
 	x["./include/libelf.h"]=1
 	x["./include/gelf.h"]=1
 	x["./include/nlist.h"]=1
diff --git a/variants/ccx-x86_64/linux b/variants/ccx-x86_64/linux
@@ -7,7 +7,9 @@
 #+flex.322ebabc6eba6cdfd84b1b90f25790b8d917035872c2e6bb2f4c8e2f05eabcfd
 #+bison.1a189980b7909de4d49b57a4821f58147c2cc150fcd4227cb88b63342551a10f
 #+rsync.8ddf33e53ecdd1f6b001cfb4ab0ed5f7db674fd7fd4ad2594eaa9976f2f2d212
-#+libelf.df002a6ebab4f40d4668363a08b9139f16d53e7564dba6af9850b3879104a54e
+#+zstd.8b11bd81c450d61aa6a44ffd019654c590439df68ebd8987db4cdbbcf182d67c
+#+libelf.e2034bf07acca1d8a8811f3102da2237bd8562bfa1c11c41dfcb6ed5909098fa
+#+pkgconf-pkg-config.86f9c193f6ccc64cc2ac696a7e3a258f01b8d0c539312ae37c08ea2354332e90
 #@untar:-J:sha256:2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb:.
 #@sha256:d9b01e4dac3dd140c394227603c8b3339bb2f1e10c97afd3607d84e3003ec75a:patch-6.1.34.xz
 #@sha256:f33d82840d1db22114e18626b64922fa1a3b539a2dee6847528ecc1b17b7b659:linux.config
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.c2697b00abb5e65c49915a929ad7b4784decc60d122dd0363269c4342b4e5d51-
\ No newline at end of file
+#+linux.b51d8a46baa195268d5773ec2b212e5238bc68828d49643aec44449a0acdab4a+
\ No newline at end of file
diff --git a/variants/root-x86_64/libelf b/variants/root-x86_64/libelf
@@ -14,16 +14,33 @@ build_env_static() {
 prefix=/versions/$pthbs_package
 build_env_static
 cd libelf
-make -j${JOBS:-1} -l$((1+${JOBS:-1})) PREFIX=/versions/$pthbs_package \
+make -j${JOBS:-1} -l$((1+${JOBS:-1})) PREFIX="$prefix" \
 	DESTDIR="$pthbs_destdir" \
 	INCDIR="$prefix/include" \
 	LIBDIR="$prefix/library" \
 	install-static
 
+mkdir -p "$pthbs_destdir/${prefix#/}/library/pkgconfig"
+printf '%s\n' > "$pthbs_destdir/${prefix#/}/library/pkgconfig/libelf.pc" \
+	"prefix=/versions/$pthbs_package" \
+	'exec_prefix=${prefix}' \
+	'includedir=${prefix}/include' \
+	'libdir=${exec_prefix}/library' \
+	'' \
+	'Name: libelf' \
+	'Description: standalone libelf' \
+	'Version: 0.193' \
+	'' \
+	'Requires:' \
+	'Libs: -L${libdir} -lz -lzstd' \
+	'Cflags: -I${includedir}'
+
+
 cd "$pthbs_destdir/versions/$pthbs_package"
 find -type d -o -print | awk -F/ '
 BEGIN {
 	x["./library/libelf.a"]=1
+	x["./library/pkgconfig/libelf.pc"]=1
 	x["./include/libelf.h"]=1
 	x["./include/gelf.h"]=1
 	x["./include/nlist.h"]=1
diff --git a/variants/root-x86_64/linux b/variants/root-x86_64/linux
@@ -7,7 +7,9 @@
 #+flex.42bdab01fb2083e92a4417d5fb289c468b9a1a5b8092904b965455b74559262f
 #+bison.d9992ea20119a82e24982f67479e65e94ec0fdc686f024f0ed04e87c83a00ef0
 #+rsync.0d38ed5b8c53de378afb90bb4162a0adc58ffce7c9ddc40cacdb6db2cda01a15
-#+libelf.259277f6a8a611d72d29b2d4cf62f3b9324f22e917de7a84e7dadfbc3b76fda3
+#+zstd.a83f72c5953bd6b7afc171528a503710b3144bf9197961833fd27926b0a18137
+#+libelf.208d2361a9051d1b6e6350e9c5cfc0e8137a9d6fed40aec0b7b0639e0e3339cf
+#+pkgconf-pkg-config.ea4d3fe0fca073b8e3eb3b731df4d36c062498864ee04f68ce000a6f282b5621
 #@untar:-J:sha256:2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb:.
 #@sha256:d9b01e4dac3dd140c394227603c8b3339bb2f1e10c97afd3607d84e3003ec75a:patch-6.1.34.xz
 #@sha256:f33d82840d1db22114e18626b64922fa1a3b539a2dee6847528ecc1b17b7b659:linux.config