Commit 2249a35d authored by Dridi Boukelmoune's avatar Dridi Boukelmoune Committed by Denis Brækhus

Add a (64bit) suffix to RPM provides for VMODs

Same as traditional shared objects, it now looks like this:

    varnish = x.y.z-r
    varnish(x86-64) = x.y.z-r
    libvarnishapi.so.1()(64bit)
    libvarnishapi.so.1(LIBVARNISHAPI_2.0)(64bit)
    varnishd(abi) = sha1
    varnishd(vrt) = a.b
    vmod(blob)(64bit) = x.y.z-r
    vmod(directors)(64bit) = x.y.z-r
    vmod(purge)(64bit) = x.y.z-r
    vmod(std)(64bit) = x.y.z-r
    vmod(vtc)(64bit) = x.y.z-r

Maybe varnishd(*) provides should be ISA-bits-aware too.
parent d043e9e5
......@@ -11,10 +11,10 @@ shift
# No $RPM_BUILD_ROOT on el6
VMOD_VERSION=
if [ -n "$VERSION" ]
then
VMOD_VERSION=" = ${VERSION%.*}" # remove arch
fi
test -n "$VERSION" && VMOD_VERSION=" = ${VERSION%.*}" # remove arch
VMOD_BITS=
test "$(rpm --eval %__isa_bits)" -eq 64 && VMOD_BITS='(64bit)'
expand_macro() {
cpp - -Iinclude <<-EOF |
......@@ -49,7 +49,7 @@ do
*/libvmod_*.so)
VMOD=${FILE##*/libvmod_}
VMOD=${VMOD%.so}
printf 'vmod(%s)%s\n' "$VMOD" "$VMOD_VERSION"
printf 'vmod(%s)%s%s\n' "$VMOD" "$VMOD_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