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 336BD1382C5 for ; Tue, 12 Jan 2021 13:33:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5E93CE09FB; Tue, 12 Jan 2021 13:32:59 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 492F5E09FB for ; Tue, 12 Jan 2021 13:32:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 2BB24340DDE for ; Tue, 12 Jan 2021 13:32:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 872724C for ; Tue, 12 Jan 2021 13:32:56 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1610458355.2b77d5b1db1d723f8ce576a58a0b2dd6a1ce9806.grobian@gentoo> Subject: [gentoo-commits] repo/proj/prefix:master commit in: eclass/ X-VCS-Repository: repo/proj/prefix X-VCS-Files: eclass/db.eclass X-VCS-Directories: eclass/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 2b77d5b1db1d723f8ce576a58a0b2dd6a1ce9806 X-VCS-Branch: master Date: Tue, 12 Jan 2021 13:32:56 +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: 0296afc1-1445-49bf-bc2a-39af3052a532 X-Archives-Hash: c797b220599048df17dba9e31ecb0dab commit: 2b77d5b1db1d723f8ce576a58a0b2dd6a1ce9806 Author: Fabian Groffen gentoo org> AuthorDate: Tue Jan 12 13:32:35 2021 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Tue Jan 12 13:32:35 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=2b77d5b1 eclass/db: remove AIX stuff Signed-off-by: Fabian Groffen gentoo.org> eclass/db.eclass | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/eclass/db.eclass b/eclass/db.eclass index df1e361e9b..96a857a196 100644 --- a/eclass/db.eclass +++ b/eclass/db.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: db.eclass @@ -29,22 +29,10 @@ db_fix_so() { # now rebuild all the correct ones local ext - for ext in so a dylib sl; do + for ext in so dylib 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}" ]] || continue; - case ${CHOST} in - *-aix*) - aixdll --merge-runtime \ - --keepdir=false \ - --target="${name}.${ext}" \ - --current="${target}" \ - `find . -maxdepth 1 -type f -name "${name}-*.${ext}"` - ;; - *) - ln -sf ${target//.\//} ${name}.${ext} - ;; - esac; + [[ -n "${target}" ]] && ln -sf ${target//.\//} ${name}.${ext} done; done;