Gentoo Archives: gentoo-dev

From: Jonathan Callen <abcd@g.o>
To: gentoo-dev@l.g.o
Subject: [gentoo-dev] Re: [gentoo-commits] gentoo-x86 commit in eclass: xfconf.eclass
Date: Mon, 26 Jul 2010 19:50:21
Message-Id: 4C4DE6E3.1090401@gentoo.org
In Reply to: [gentoo-dev] Re: [gentoo-commits] gentoo-x86 commit in eclass: xfconf.eclass by Samuli Suominen
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

On 07/26/2010 03:03 PM, Samuli Suominen wrote:
> On 07/26/2010 09:57 PM, Samuli Suominen (ssuominen) wrote: > > Small change to xfconf.eclass, let me know if you see something wrong > with it. > > - None of xfconf.eclass consumers install static archives (.a) because > xfce libs are simply not useful static. > - We don't have any plugins/libraries using libltdl. > > Therefore .la files have been annoying side product. > So at the risk of breaking one or two users due to disappearing > 'libxfce4util.la', this seems to be the cleanest way to be done with it. > The fix is obvious to most: lafilefixer > >> --- xfconf.eclass 13 Jun 2010 16:10:21 -0000 1.16 >> +++ xfconf.eclass 26 Jul 2010 18:57:14 -0000 1.17 >> @@ -1,6 +1,6 @@ >> # Copyright 1999-2009 Gentoo Foundation >> # Distributed under the terms of the GNU General Public License v2 >> -# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.16 2010/06/13 16:10:21 ssuominen Exp $ >> +# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.17 2010/07/26 18:57:14 ssuominen Exp $ >> >> # @ECLASS: xfconf.eclass >> # @MAINTAINER: >> @@ -138,6 +138,9 @@ >> if [[ -n ${DOCS} ]]; then >> dodoc ${DOCS} || die "dodoc failed" >> fi >> + >> + has "${EAPI:-0}" 0 1 2 && ! use prefix && ED="${D}" >> + find "${ED}" -name '*.la' -exec rm -f {} + >> } >> >> # @FUNCTION: xfconf_pkg_preinst
Personally, I would have just done `find "${D}" -name '*.la' -exec rm -f {} +`, because there are no files in $D that are not in $ED (if there are, portage will refuse to merge the package on Prefix). -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iQIcBAEBCAAGBQJMTebjAAoJELHSF2kinlg4/3YQAILmGYFlLkzVnMdD4mUGifLx kZjMs3klDcWguQXJmA2sYRSSZtV/g5Men5/yfvjOIGGtiW0LUBuJl7BawCnhiddp uXjtlbVUGSOmQjWp/xy4gDyv21DYd/H/kcLmDcfjgfIObxyXC0X9q1VLG44ggGkj M5PML/2me17ArOy3hXbj/T/HtpTI1cp+EOw+Kp7XLhLrnztgocAh2taNcpnHQM1a rws+GEXbUkLguGQek+rcw9xhzVMhe/11ZdZWvsudNqwFsTZ2cOcSH4UxxxvbbFnb b8Qujh7Wqfz3sWEoaSGaoLPVGwgxy35SIsdBRdvvvFjLFc2Vuga9iAW4adgV1IyM oTXntGgKhzaRnJe+oousQioURqzYUA2eaq5rb67hyxGIUd2UwRR9nK86hSfgC5XT z2Y6TC8CmrPQD+6jptvdrnCFaGn7Cz8glM99x4qOnkvr35k9hUHZpu3U4Ca3s7V7 xu6qA6U/pbXglHGHc4ug3YUqDZFx/yMROI9YL+Mf2Ogt/EnC/oORL1g1VteRWlUO frvd1K1F2JqAq2SS1o15U7kQ9vapSU2sCBsbAtg6CfmEGMACngIug86jQlJKtJ7f B0+2O/dImIhvpH0E9BkHB6zcCa4tRwur5KO8i+U/sMmo2ZBSOx/VcysUGkW9b0J/ eNusNJ6xg+eDP1uITD26 =fTXV -----END PGP SIGNATURE-----