From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3E39B1396D9 for ; Sun, 5 Nov 2017 20:46:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A2E7BE0E59; Sun, 5 Nov 2017 20:46:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 77A9EE0E59 for ; Sun, 5 Nov 2017 20:46:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A296D3416EE for ; Sun, 5 Nov 2017 20:46:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6943C9626 for ; Sun, 5 Nov 2017 20:46:29 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1509914727.d5eaafc35a30d6371c1edfc53d44cf0678a849c8.robbat2@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-nds/openldap/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-nds/openldap/openldap-2.4.44-r1.ebuild net-nds/openldap/openldap-2.4.44.ebuild net-nds/openldap/openldap-2.4.45.ebuild X-VCS-Directories: net-nds/openldap/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: d5eaafc35a30d6371c1edfc53d44cf0678a849c8 X-VCS-Branch: master Date: Sun, 5 Nov 2017 20:46:29 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: d3e694d2-59f0-435d-a70d-7cb46b09c14f X-Archives-Hash: 935d269de79d59d608a069f7d5159230 commit: d5eaafc35a30d6371c1edfc53d44cf0678a849c8 Author: Zhao Yongming gmail com> AuthorDate: Mon Oct 16 08:50:09 2017 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Sun Nov 5 20:45:27 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5eaafc3 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 gentoo.org> net-nds/openldap/openldap-2.4.44-r1.ebuild | 3 ++- net-nds/openldap/openldap-2.4.44.ebuild | 3 ++- 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 b25baead93f..b4e5a2c3c69 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 be14b0370f6..a782cf0ca6c 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 de36c98cf1a..6b11f7e0475 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() {