Commit 6e512d88 authored by Dridi Boukelmoune's avatar Dridi Boukelmoune

Bitful RPM varnishd(*) provides

In other words on 64bit systems:

    Provides: varnishd(abi)(64bit) = sha1
    Provides: varnishd(vrt)(64bit) = x.y

Same as VMOD virtual provides.
parent d271a5a9
......@@ -11,8 +11,8 @@ shift
VMOD_VERSION=" = ${VERSION%.*}" # remove arch
VMOD_BITS=
test "$(rpm --eval %__isa_bits)" -eq 64 && VMOD_BITS='(64bit)'
ABI_BITS=
test "$(rpm --eval %__isa_bits)" -eq 64 && ABI_BITS='(64bit)'
expand_macro() {
cpp - -Iinclude <<-EOF |
......@@ -32,8 +32,8 @@ varnishd_provides() (
VRT_MINOR=$(expand_macro VRT_MINOR_VERSION | tr -c -d '[0-9]')
cat <<-EOF
varnishd(abi) = $ABI
varnishd(vrt) = $VRT_MAJOR.$VRT_MINOR
varnishd(abi)$ABI_BITS = $ABI
varnishd(vrt)$ABI_BITS = $VRT_MAJOR.$VRT_MINOR
EOF
)
......@@ -47,7 +47,7 @@ do
*/libvmod_*.so)
VMOD=${FILE##*/libvmod_}
VMOD=${VMOD%.so}
printf 'vmod(%s)%s%s\n' "$VMOD" "$VMOD_BITS" "$VMOD_VERSION"
printf 'vmod(%s)%s%s\n' "$VMOD" "$ABI_BITS" "$VMOD_VERSION"
;;
*)
printf "%s\n" "$FILE" | $FIND_PROVIDES "$@"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment