RepoMirrors/abuild
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/abuild.git synced 2025-04-01 22:48:56 +00:00
Code Issues Projects Releases Wiki Activity

abuild: remove libc specific logic

Browse Source 
Last use of the '!libc_*' option has been removed in [61cb57cda98].
libpthread special casing only triggers on uclibc.

[61cb57cda98]: https://git.alpinelinux.org/aports/commit/?id=61cb57cda98923032f7ff15f7a0f057bb35aae6d
This commit is contained in:
Sertonix 2024-04-09 23:05:40 +02:00 committed by Natanael Copa
parent 20b1f47c63
commit 6aa8fcc012
2 changed files with 5 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
abuild.1.scd
View File

@ -28,7 +28,7 @@ other related operations.
Set APKINDEX description (default: *$repo $(git describe)*) Set APKINDEX description (default: *$repo $(git describe)*)
*-f* *-f*
Force specified cmd (skip checks: apk up to date, arch, libc) Force specified cmd (skip checks: apk up to date, arch)
*-F* *-F*
Force run as root Force run as root

21
abuild.in
View File

@ -1491,14 +1491,6 @@ trace_apk_deps() {
autodeps="$autodeps pkgconfig" autodeps="$autodeps pkgconfig"
fi fi
# special case for libpthread: we need depend on libgcc
if [ "$CLIBC" = "uclibc" ] && [ -f "$dir"/.needs-so ] \
&& grep -q -w '^libpthread.so.*' "$dir"/.needs-so \
&& ! grep -q -w "^depend = libgcc" "$dir"/.PKGINFO; then
autodeps="$autodeps libgcc"
msg " added libgcc (due to libpthread)"
fi
[ -f "$dir"/.needs-so ] && for i in $(cat "$dir"/.needs-so); do [ -f "$dir"/.needs-so ] && for i in $(cat "$dir"/.needs-so); do
# first check if its provided by same apkbuild # first check if its provided by same apkbuild
grep -q -w "^$sonameprefix$i" "$dir"/.provides-so 2>/dev/null && continue grep -q -w "^$sonameprefix$i" "$dir"/.provides-so 2>/dev/null && continue
@ -2304,11 +2296,6 @@ check_arch() {
return $ret return $ret
} }
# return true if libc is not masked in options
check_libc() {
! options_has "!libc_$CLIBC"
}
# check if package is up to date # check if package is up to date
apk_up2date() { apk_up2date() {
local i s local i s
@ -2359,7 +2346,6 @@ abuildindex_up2date() {
up2date() { up2date() {
check_arch || return 0 check_arch || return 0
check_libc || return 0
apk_up2date && abuildindex_up2date apk_up2date && abuildindex_up2date
} }
@ -2787,13 +2773,10 @@ uninstalldeps() { undeps; }
index() { update_abuildrepo_index; } index() { update_abuildrepo_index; }
all() { all() {
if ! [ -n "$force" ]; then if ! [ -n "$force" ] && ! check_arch; then
if ! check_arch; then
echo "Package not available for the target architecture ($CARCH). Aborting." echo "Package not available for the target architecture ($CARCH). Aborting."
return 0 return 0
fi fi
check_libc || return 0
fi
if up2date && [ -z "$force" ]; then if up2date && [ -z "$force" ]; then
msg "Package is up to date" msg "Package is up to date"
else else
@ -2855,7 +2838,7 @@ usage() {
-c Enable colored output -c Enable colored output
-d Disable dependency checking -d Disable dependency checking
-D Set APKINDEX description (default: \$repo \$(git describe)) -D Set APKINDEX description (default: \$repo \$(git describe))
-f Force specified cmd (skip checks: apk up to date, arch, libc) -f Force specified cmd (skip checks: apk up to date, arch)
-F Force run as root -F Force run as root
-h Show this help -h Show this help
-k Keep built packages, even if APKBUILD or sources are newer -k Keep built packages, even if APKBUILD or sources are newer