diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2013-05-03 09:20:56 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2013-05-03 09:20:56 +0000 |
| commit | 52e4c6f4bb4d92097afeb566f9ea621dc328e88d (patch) | |
| tree | 80ca1a41c942d80ba62d2e5018f485bfdf664543 | |
| parent | Version bump, add truetype use flag. (diff) | |
| download | gentoo-2-52e4c6f4bb4d92097afeb566f9ea621dc328e88d.tar.gz gentoo-2-52e4c6f4bb4d92097afeb566f9ea621dc328e88d.tar.bz2 gentoo-2-52e4c6f4bb4d92097afeb566f9ea621dc328e88d.zip | |
Support disabling .la pruning completely.
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/autotools-utils.eclass | 9 |
2 files changed, 11 insertions, 3 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 105899985b20..69123f95c055 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.810 2013/05/01 15:48:16 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.811 2013/05/03 09:20:56 mgorny Exp $ + + 03 May 2013; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass: + Support disabling .la pruning completely. 01 May 2013; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass: Inline src_test and allow passing arguments. diff --git a/eclass/autotools-utils.eclass b/eclass/autotools-utils.eclass index e6bf5265e0c0..765dc55f5de3 100644 --- a/eclass/autotools-utils.eclass +++ b/eclass/autotools-utils.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.66 2013/05/01 15:48:16 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.67 2013/05/03 09:20:56 mgorny Exp $ # @ECLASS: autotools-utils.eclass # @MAINTAINER: @@ -200,6 +200,9 @@ EXPORT_FUNCTIONS src_prepare src_configure src_compile src_install src_test # If set to 'all', all .la files will be removed unconditionally. This # option is discouraged and shall be used only if 'modules' does not # remove the files. +# +# If set to 'none', no .la files will be pruned ever. Use in corner +# cases only. # Determine using IN or OUT source build _check_build_dir() { @@ -529,7 +532,9 @@ autotools-utils_src_install() { # Remove libtool files and unnecessary static libs local prune_ltfiles=${AUTOTOOLS_PRUNE_LIBTOOL_FILES} - prune_libtool_files ${prune_ltfiles:+--${prune_ltfiles}} + if [[ ${prune_ltfiles} != none ]]; then + prune_libtool_files ${prune_ltfiles:+--${prune_ltfiles}} + fi } # @FUNCTION: autotools-utils_src_test |