mirror of
https://github.com/containers/skopeo.git
synced 2025-08-17 22:17:10 +00:00
Fix libsubid detection
Currently, `$(hack/libsubid_tag.sh)` produces no buildtag output. This patch fixes it. 1. Library arguments must be positioned after sources when invoking GCC. 2. Use new function name: `subid_get_uid_ranges`. Refs: rhbz: https://bugzilla.redhat.com/show_bug.cgi?id=2254902 podman file: https://github.com/containers/podman/blob/main/hack/libsubid_tag.sh Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
This commit is contained in:
parent
9646311612
commit
c705331271
@ -5,11 +5,16 @@ fi
|
|||||||
tmpdir="$PWD/tmp.$RANDOM"
|
tmpdir="$PWD/tmp.$RANDOM"
|
||||||
mkdir -p "$tmpdir"
|
mkdir -p "$tmpdir"
|
||||||
trap 'rm -fr "$tmpdir"' EXIT
|
trap 'rm -fr "$tmpdir"' EXIT
|
||||||
cc -o "$tmpdir"/libsubid_tag -l subid -x c - > /dev/null 2> /dev/null << EOF
|
cc -o "$tmpdir"/libsubid_tag -x c - -l subid > /dev/null 2> /dev/null << EOF
|
||||||
#include <shadow/subid.h>
|
#include <shadow/subid.h>
|
||||||
|
#include <stdlib.h>
|
||||||
int main() {
|
int main() {
|
||||||
struct subid_range *ranges = NULL;
|
struct subid_range *ranges = NULL;
|
||||||
|
#if SUBID_ABI_MAJOR >= 4
|
||||||
|
subid_get_uid_ranges("root", &ranges);
|
||||||
|
#else
|
||||||
get_subuid_ranges("root", &ranges);
|
get_subuid_ranges("root", &ranges);
|
||||||
|
#endif
|
||||||
free(ranges);
|
free(ranges);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user