Bug 412133 – waf-utils.eclass: waf-utils_src_configure should test for --libdir before using it

• Status: RESOLVED FIXED
• Product: Gentoo Linux

[Description SpanKY 2012-04-15 20:13:31 UTC]

some packages don't support --libdir (like glmark2), and so they end up copying & pasting most of the waf-utils.eclass logic.  could we extend the logic like so:

-    echo "CCFLAGS=\"${CFLAGS}\" LINKFLAGS=\"${LDFLAGS}\" \"${WAF_BINARY}\" --prefix=${EPREFIX}/usr --libdir=${EPREFIX}/usr/$(get_libdir) $@ configure"
+
+    # Make sure this waf supports --libdir
+    if "${WAF_BINARY}" --help | grep -q -e--libdir ; then
+        set -- "--libdir=${EPREFIX}/usr/$(get_libdir)" "$@"
+    fi
+
+    echo "CCFLAGS=\"${CFLAGS}\" LINKFLAGS=\"${LDFLAGS}\" \"${WAF_BINARY}\" --prefix=${EPREFIX}/usr $@ configure"

[Comment 1 Pacho Ramos 2012-07-07 12:49:06 UTC]

Looks ok to me, if no other gnome team disagrees, feel free to commit

[Comment 2 SpanKY 2012-07-17 04:43:48 UTC]

hopefully i didn't screw anything up

http://sources.gentoo.org/eclass/waf-utils.eclass?r1=1.11&r2=1.12

[Comment 3 Alexis Ballier 2012-07-20 01:13:15 UTC]

(In reply to comment #2)
> hopefully i didn't screw anything up
> 
> http://sources.gentoo.org/eclass/waf-utils.eclass?r1=1.11&r2=1.12

this broke libdir setting for media-libs/suil

[Comment 4 Alexis Ballier 2012-07-20 01:16:24 UTC]

not sure why but it seems running waf --help within the ebuild doesnt work while from my terminal it does work