sys-fs/xfsprogs: rework static flag handling #551810

The use of -static when linking causes bad rpaths when USE=-static-libs
because only dynamic xfs libs are available.  But we don't really want
to link the programs against the static xfs libs when we have dynamic
ones available.

diff --git a/sys-fs/xfsprogs/xfsprogs-4.2.0.ebuild b/sys-fs/xfsprogs/xfsprogs-4.2.0.ebuild
index 35a490f370b99c18934edf9d6efcb464acef47d1..45d31297c5c806b8377826d515109d8eb2c2db7f 100644 (file)
--- a/sys-fs/xfsprogs/xfsprogs-4.2.0.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-4.2.0.ebuild
@@ -39,15 +39,14 @@ pkg_setup() {
 src_prepare() {
        epatch "${FILESDIR}"/${PN}-4.2.0-sharedlibs.patch
 
+       # LLDFLAGS is used for programs, so apply -all-static when USE=static is enabled.
+       # Clear out -static from all flags since we want to link against dynamic xfs libs.
        sed -i \
                -e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
+               -e "1iLLDFLAGS += $(usex static '-all-static' '')" \
                include/builddefs.in || die
-       sed -i \
-               -e '1iLLDFLAGS = -static' \
-               {estimate,fsr}/Makefile || die
-       sed -i \
-               -e "/LLDFLAGS/s:-static-libtool-libs:$(use static && echo -all-static):" \
-               $(find -name Makefile) || die
+       find -name Makefile -exec \
+               sed -i -r -e '/^LLDFLAGS [+]?= -static(-libtool-libs)?$/d' {} +
 
        # libdisk has broken blkid conditional checking
        sed -i \