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 460911382C5 for ; Sat, 16 Jan 2021 16:11:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4C509E07D8; Sat, 16 Jan 2021 16:11:48 +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 2F40DE07D8 for ; Sat, 16 Jan 2021 16:11:47 +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 8B0CB340D21 for ; Sat, 16 Jan 2021 16:11:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EE8D2496 for ; Sat, 16 Jan 2021 16:11:44 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1610813290.e154526e7b59f94428b302b6360e54b5f689b9a5.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/db.eclass X-VCS-Directories: eclass/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: e154526e7b59f94428b302b6360e54b5f689b9a5 X-VCS-Branch: master Date: Sat, 16 Jan 2021 16:11:44 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ffa9fc6e-03d5-4fdb-a6e0-5428e0a15ed7 X-Archives-Hash: 97a8e2346b41ad6d9e81c1a9e68a9afa commit: e154526e7b59f94428b302b6360e54b5f689b9a5 Author: Mike Gilbert gentoo org> AuthorDate: Sat Jan 16 16:08:10 2021 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Sat Jan 16 16:08:10 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e154526e Revert "eclass/db.eclass: use get_libname for Darwin support" This change somehow causes libdb.so to be installed. Bug: https://bugs.gentoo.org/673322 Closes: https://bugs.gentoo.org/765625 Reverts: b158fba5eee07da21f8b80fd737b9bdd3865256b Signed-off-by: Mike Gilbert gentoo.org> eclass/db.eclass | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/eclass/db.eclass b/eclass/db.eclass index 96a857a1962..9a246d18979 100644 --- a/eclass/db.eclass +++ b/eclass/db.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: db.eclass @@ -23,13 +23,13 @@ db_fix_so() { cd "${LIB}" || die # first clean up old symlinks - find "${LIB}" -maxdepth 1 -type l -name 'libdb[1._-]*'"$(get_libname)" -delete || die - find "${LIB}" -maxdepth 1 -type l -name 'libdb[1._-]*'"$(get_libname "[23]")" -delete || die + find "${LIB}" -maxdepth 1 -type l -name 'libdb[1._-]*so' -delete || die + find "${LIB}" -maxdepth 1 -type l -name 'libdb[1._-]*so.[23]' -delete || die find "${LIB}" -maxdepth 1 -type l -name 'libdb[1._-]*a' -delete || die # now rebuild all the correct ones local ext - for ext in so dylib a; do + for ext in so a; do for name in libdb libdb_{cxx,tcl,java,sql,stl}; do target="$(find . -maxdepth 1 -type f -name "${name}-*.${ext}" |sort -V |tail -n 1)" [[ -n "${target}" ]] && ln -sf ${target//.\//} ${name}.${ext} @@ -37,17 +37,17 @@ db_fix_so() { done; # db[23] gets some extra-special stuff - if [[ -f libdb1$(get_libname 2) ]]; then - ln -sf libdb1$(get_libname 2) libdb$(get_libname 2) - ln -sf libdb1$(get_libname 2) libdb1$(get_libname) - ln -sf libdb1$(get_libname 2) libdb-1$(get_libname) + if [[ -f libdb1.so.2 ]]; then + ln -sf libdb1.so.2 libdb.so.2 + ln -sf libdb1.so.2 libdb1.so + ln -sf libdb1.so.2 libdb-1.so fi # what do we do if we ever get 3.3 ? local i for i in libdb libdb_{cxx,tcl,java,sql,stl}; do - if [[ -f $i-3.2$(get_libname) ]]; then - ln -sf $i-3.2$(get_libname) $i-3$(get_libname) - ln -sf $i-3.2$(get_libname) $i$(get_libname 3) + if [[ -f ${i}-3.2.so ]]; then + ln -sf ${i}-3.2.so ${i}-3.so + ln -sf ${i}-3.2.so ${i}.so.3 fi done @@ -143,8 +143,8 @@ db_src_install_usrlibcleanup() { mv "${LIB}/libdb_cxx.a" "${LIB}/libdb_cxx-${SLOT}.a" || die fi - find "${LIB}" -maxdepth 1 -type l -name 'libdb[1._-]*'"$(get_libname)" -delete || die - find "${LIB}" -maxdepth 1 -type l -name 'libdb[1._-]*'"$(get_libname "[23]")" -delete || die + find "${LIB}" -maxdepth 1 -type l -name 'libdb[1._-]*so' -delete || die + find "${LIB}" -maxdepth 1 -type l -name 'libdb[1._-]*so.[23]' -delete || die einfo "removing unversioned static archives" find "${LIB}" -maxdepth 1 -type l -name 'libdb[1._-]*a' -delete || die