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 3167D1382C5 for ; Tue, 15 Dec 2020 07:48:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4CDFFE08D3; Tue, 15 Dec 2020 07:48:17 +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 206DDE08D3 for ; Tue, 15 Dec 2020 07:48:17 +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 48C8A340F15 for ; Tue, 15 Dec 2020 07:48:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A2FAC49 for ; Tue, 15 Dec 2020 07:48:13 +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: <1608018444.a788e4c0792d7b6cd70747d75c01da9cd97df54e.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: a788e4c0792d7b6cd70747d75c01da9cd97df54e X-VCS-Branch: master Date: Tue, 15 Dec 2020 07:48:13 +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: ff9f32d0-69fd-4bb1-bba0-6163d2cba893 X-Archives-Hash: 857230037ceb9b8dc832eb2f56b54b0b commit: a788e4c0792d7b6cd70747d75c01da9cd97df54e Author: Fabian Groffen gentoo org> AuthorDate: Tue Dec 15 07:47:24 2020 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Tue Dec 15 07:47:24 2020 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=a788e4c0 eclass/db.eclass: sync with gx86 Signed-off-by: Fabian Groffen gentoo.org> eclass/db.eclass | 66 ++++++++++++++++++++++++++++++-------------------------- 1 file changed, 35 insertions(+), 31 deletions(-) diff --git a/eclass/db.eclass b/eclass/db.eclass index 7f80f13823..8d905c9c4e 100644 --- a/eclass/db.eclass +++ b/eclass/db.eclass @@ -20,18 +20,19 @@ db_fix_so() { has "${EAPI:-0}" 0 1 2 && ! use prefix && EROOT="${ROOT}" LIB="${EROOT}/usr/$(get_libdir)" - cd "${LIB}" + cd "${LIB}" || die # first clean up old symlinks - find "${LIB}" -maxdepth 1 -type l -name 'libdb[1._-]*'"$(get_libname)" -exec rm \{} \; - find "${LIB}" -maxdepth 1 -type l -name 'libdb[1._-]*'"$(get_libname "[23]")" -exec rm \{} \; - find "${LIB}" -maxdepth 1 -type l -name 'libdb[1._-]*a' -exec rm \{} \; + 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._-]*a' -delete || die # now rebuild all the correct ones + local ext for ext in so a dylib sl; do for name in libdb libdb_{cxx,tcl,java,sql,stl}; do - target=`find . -maxdepth 1 -type f -name "${name}-*.${ext}" |sort -n |tail -n 1` - [ -n "${target}" ] || continue; + target="$(find . -maxdepth 1 -type f -name "${name}-*.${ext}" |sort -V |tail -n 1)" + [[ -n "${target}" ]] || continue; case ${CHOST} in *-aix*) aixdll --merge-runtime \ @@ -48,14 +49,15 @@ db_fix_so() { done; # db[23] gets some extra-special stuff - if [ -f libdb1$(get_libname 2) ]; then + 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) 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$(get_libname 2) ]; then + if [[ -f $i-3$(get_libname 2) ]]; then ln -sf $i-3$(get_libname 2) $i-3$(get_libname) ln -sf $i-3$(get_libname 2) $i$(get_libname 3) fi @@ -64,15 +66,15 @@ db_fix_so() { # do the same for headers now # but since there are only two of them, just overwrite them cd "${EROOT}"/usr/include - target=`find . -maxdepth 1 -type d -name 'db[0-9]*' | sort -n |cut -d/ -f2- | tail -n1` - if [ -n "${target}" ] && [ -e "${target}/db.h" ] && ( ! [[ -e db.h ]] || [[ -h db.h ]] ); then + target="$(find . -maxdepth 1 -type d -name 'db[0-9]*' | sort -V |cut -d/ -f2- | tail -n1)" + if [[ -n "${target}" ]] && [[ -e "${target}/db.h" ]] && ( ! [[ -e db.h ]] || [[ -h db.h ]] ); then einfo "Creating db.h symlinks to ${target}" ln -sf "${target}"/db.h . ln -sf "${target}"/db_185.h . - elif [ ! -e "${target}/db.h" ]; then - if [ -n "${target}" ]; then + elif [[ ! -e "${target}/db.h" ]]; then + if [[ -n "${target}" ]]; then ewarn "Could not find ${target}/db.h" - elif [ -h db.h ]; then + elif [[ -h db.h ]]; then einfo "Apparently you just removed the last instance of $PN. Removing the symlinks" rm -f db.h db_185.h fi @@ -84,7 +86,7 @@ db_src_install_doc() { # not everybody wants this wad of documentation as it is primarily API docs if use doc; then dodir /usr/share/doc/${PF}/html - mv "${ED}"/usr/docs/* "${ED}"/usr/share/doc/${PF}/html/ + mv "${ED}"/usr/docs/* "${ED}"/usr/share/doc/${PF}/html/ || die rm -rf "${ED}"/usr/docs else rm -rf "${ED}"/usr/docs @@ -96,16 +98,17 @@ db_src_install_doc() { db_src_install_examples() { has "${EAPI:-0}" 0 1 2 && ! use prefix && ED="${D}" if use examples ; then - local langs="c cxx stl" + local langs=( c cxx stl ) [[ "${IUSE/java}" != "${IUSE}" ]] \ && use java \ - && langs="${langs} java" - for i in $langs ; do + && langs+=( java ) + local i + for i in ${langs[@]} ; do destdir="/usr/share/doc/${PF}/" src="${S}/../examples_${i}/" - if [ -f "${src}" ]; then + if [[ -f "${src}" ]]; then dodir "${destdir}" - cp -ra "${src}" "${ED}${destdir}/" + cp -ra "${src}" "${ED}${destdir}/" || die fi done fi @@ -114,6 +117,7 @@ db_src_install_examples() { db_src_install_usrbinslot() { has "${EAPI:-0}" 0 1 2 && ! use prefix && ED="${D}" # slot all program names to avoid overwriting + local fname for fname in "${ED}"/usr/bin/db* do dn="$(dirname "${fname}")" @@ -128,7 +132,7 @@ db_src_install_headerslot() { has "${EAPI:-0}" 0 1 2 && ! use prefix && ED="${D}" # install all headers in a slotted location dodir /usr/include/db${SLOT} - mv "${ED}"/usr/include/*.h "${ED}"/usr/include/db${SLOT}/ + mv "${ED}"/usr/include/*.h "${ED}"/usr/include/db${SLOT}/ || die } db_src_install_usrlibcleanup() { @@ -137,24 +141,24 @@ db_src_install_usrlibcleanup() { # Clean out the symlinks so that they will not be recorded in the # contents (bug #60732) - if [ "${ED}" = "" ]; then - die "Calling clean_links while \$ED not defined" + if [[ "${ED}" = "" ]]; then + die "Calling clean_links while \${ED} not defined" fi - if [ -e "${LIB}"/libdb.a ] && [ ! -e "${LIB}"/libdb-${SLOT}.a ]; then + if [[ -e "${LIB}"/libdb.a ]] && [[ ! -e "${LIB}"/libdb-${SLOT}.a ]]; then einfo "Moving libdb.a to a versioned name" - mv "${LIB}/libdb.a" "${LIB}/libdb-${SLOT}.a" + mv "${LIB}/libdb.a" "${LIB}/libdb-${SLOT}.a" || die fi - if [ -e "${LIB}"/libdb_cxx.a ] && [ ! -e "${LIB}"/libdb_cxx-${SLOT}.a ]; then + if [[ -e "${LIB}"/libdb_cxx.a ]] && [[ ! -e "${LIB}"/libdb_cxx-${SLOT}.a ]]; then einfo "Moving libdb_cxx.a to a versioned name" - mv "${LIB}/libdb_cxx.a" "${LIB}/libdb_cxx-${SLOT}.a" + mv "${LIB}/libdb_cxx.a" "${LIB}/libdb_cxx-${SLOT}.a" || die fi - find "${LIB}" -maxdepth 1 -type l -name 'libdb[1._-]*'"$(get_libname)" -exec rm \{} \; - find "${LIB}" -maxdepth 1 -type l -name 'libdb[1._-]*'"$(get_libname "[23]")" -exec rm \{} \; + 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 einfo "removing unversioned static archives" - find "${LIB}" -maxdepth 1 -type l -name 'libdb[1._-]*a' -exec rm \{} \; + find "${LIB}" -maxdepth 1 -type l -name 'libdb[1._-]*a' -delete || die rm -f \ "${ED}"/usr/include/{db,db_185}.h \ @@ -174,7 +178,7 @@ db_src_test() { ewarn "This can take 6+ hours on modern machines" # Fix stuff that fails with relative paths, and upstream moving files # around... - local test_parallel='' + local test_parallel='' t for t in \ "${S}"/test/parallel.tcl \ "${S}"/../test/parallel.tcl \ @@ -200,7 +204,7 @@ db_src_test() { echo "run_parallel $(makeopts_jobs) run_std" >> testrunner.tcl tclsh testrunner.tcl - egrep -qs '^FAIL' ALL.OUT* && die "Some tests failed, please see ${S}/ALL.OUT*" + grep -Eqs '^FAIL' ALL.OUT* && die "Some tests failed, please see ${S}/ALL.OUT*" else eerror "You must have USE=tcl to run the sys-libs/db testsuite." fi