diff options
| author |   Zhao Yongming <ming.zym@gmail.com> | 2017-10-16 16:50:09 +0800 |
|---|---|---|
| committer |   Robin H. Johnson <robbat2@gentoo.org> | 2017-11-05 12:45:27 -0800 |
| commit | d5eaafc35a30d6371c1edfc53d44cf0678a849c8 (patch) | |
| tree | be3e816c18d26d9d54f3d364db1313f5ef89de45 /net-nds/openldap | |
| parent | net-analyzer/prometheus: Version bump to 2.0.0_rc3 (diff) | |
| download | gentoo-d5eaafc35a30d6371c1edfc53d44cf0678a849c8.tar.gz gentoo-d5eaafc35a30d6371c1edfc53d44cf0678a849c8.tar.bz2 gentoo-d5eaafc35a30d6371c1edfc53d44cf0678a849c8.zip | |
net-nds/openldap: fix modules libtool files prune
the prune_libtool_files is run before the modules intall, that will
leave many la files in openldap module directory broken due to main
la file is gone, which will make revdep-rebuild or cave fix-linkage
keep rebuilding net-nds/openldap.
keep module la files removed by default will prevent user from using
.la file in modules config, which is working but should not been
encouraged, such as BUG:600484
Fixes: https://bugs.gentoo.org/537418
(cherry picked from commit 2c2376d9efd3d77424e3c8a626a165daf881e145)
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
Diffstat (limited to 'net-nds/openldap')
| -rw-r--r-- | net-nds/openldap/openldap-2.4.44-r1.ebuild | 3 | ||||
| -rw-r--r-- | net-nds/openldap/openldap-2.4.44.ebuild | 3 | ||||
| -rw-r--r-- | net-nds/openldap/openldap-2.4.45.ebuild | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/net-nds/openldap/openldap-2.4.44-r1.ebuild b/net-nds/openldap/openldap-2.4.44-r1.ebuild index b25baead93f8..b4e5a2c3c69c 100644 --- a/net-nds/openldap/openldap-2.4.44-r1.ebuild +++ b/net-nds/openldap/openldap-2.4.44-r1.ebuild @@ -680,7 +680,6 @@ multilib_src_test() { multilib_src_install() { local lt="${BUILD_DIR}/libtool" emake DESTDIR="${D}" SHELL="${EPREFIX}"/bin/bash install - use static-libs || prune_libtool_files --all if ! use minimal && multilib_is_native_abi; then # openldap modules go here @@ -793,6 +792,8 @@ multilib_src_install() { dosbin "${S}"/contrib/slapd-tools/statslog newdoc "${S}"/contrib/slapd-tools/README README.statslog fi + + use static-libs || prune_libtool_files --all } multilib_src_install_all() { diff --git a/net-nds/openldap/openldap-2.4.44.ebuild b/net-nds/openldap/openldap-2.4.44.ebuild index be14b0370f69..a782cf0ca6cb 100644 --- a/net-nds/openldap/openldap-2.4.44.ebuild +++ b/net-nds/openldap/openldap-2.4.44.ebuild @@ -658,7 +658,6 @@ multilib_src_test() { multilib_src_install() { local lt="${BUILD_DIR}/libtool" emake DESTDIR="${D}" SHELL="${EPREFIX}"/bin/bash install - use static-libs || prune_libtool_files --all if ! use minimal && multilib_is_native_abi; then # openldap modules go here @@ -770,6 +769,8 @@ multilib_src_install() { dosbin "${S}"/contrib/slapd-tools/statslog newdoc "${S}"/contrib/slapd-tools/README README.statslog fi + + use static-libs || prune_libtool_files --all } multilib_src_install_all() { diff --git a/net-nds/openldap/openldap-2.4.45.ebuild b/net-nds/openldap/openldap-2.4.45.ebuild index de36c98cf1a0..6b11f7e0475a 100644 --- a/net-nds/openldap/openldap-2.4.45.ebuild +++ b/net-nds/openldap/openldap-2.4.45.ebuild @@ -712,7 +712,6 @@ multilib_src_test() { multilib_src_install() { local lt="${BUILD_DIR}/libtool" emake DESTDIR="${D}" SHELL="${EPREFIX}"/bin/bash install - use static-libs || prune_libtool_files --all if ! use minimal && multilib_is_native_abi; then # openldap modules go here @@ -825,6 +824,8 @@ multilib_src_install() { dosbin "${S}"/contrib/slapd-tools/statslog newdoc "${S}"/contrib/slapd-tools/README README.statslog fi + + use static-libs || prune_libtool_files --all } multilib_src_install_all() { |