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 B81341382C5 for ; Thu, 4 Feb 2021 11:08:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F00A9E091A; Thu, 4 Feb 2021 11:08:16 +0000 (UTC) Received: from rs234.mailgun.us (rs234.mailgun.us [209.61.151.234]) (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 3E10BE091A for ; Thu, 4 Feb 2021 11:08:13 +0000 (UTC) DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=0xdc.io; q=dns/txt; s=smtp; t=1612436896; h=Content-Transfer-Encoding: MIME-Version: Message-Id: Date: Subject: To: From: Sender; bh=Bk92KBk50XiIuRwa4gZmrcfuxml1SH9R6tFZr3imxOY=; b=0Qihgi7CtzXAjX2isfpA1FK40+DgrlOEPgUNLG0szsoK9IVwTtPMtIbD68fd6F/u21eDDECX YZZgnf0LM/svks6VrWapJHjo/kpuOq52fSgN8QJ7SPJQVycOvP+Vl1mmKO8L1hub3xbd/dRM VTU6rVQvysRIyN32xAvkYIam0dc= X-Mailgun-Sending-Ip: 209.61.151.234 X-Mailgun-Sid: WyJiZmIxMyIsICJnZW50b28tY2F0YWx5c3RAbGlzdHMuZ2VudG9vLm9yZyIsICJmNjc0NGUiXQ== Received: from mail.0xdc.io (ip-54-37-0.eu [54.37.0.172]) by smtp-out-n01.prod.us-east-1.postgun.com with SMTP id 601bd596e3df861f4be68fe7 (version=TLS1.3, cipher=TLS_AES_128_GCM_SHA256); Thu, 04 Feb 2021 11:08:06 GMT Sender: gentoo.catalyst=xxoo.ws@0xdc.io Received: from dysnomia (8.b.b.1.e.2.d.8.6.c.e.a.2.0.9.c.0.a.4.7.9.0.c.0.0.b.8.0.1.0.0.2.ip6.arpa [IPv6:2001:8b0:c09:74a0:c902:aec6:8d2e:1bb8]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail.0xdc.io (Postfix) with ESMTPSA id 8773C1023A3 for ; Thu, 4 Feb 2021 11:08:11 +0000 (UTC) From: Daniel Cordero To: gentoo-catalyst@lists.gentoo.org Subject: [gentoo-catalyst] [PATCH] distcc: try more combinations of libdir Date: Thu, 4 Feb 2021 11:07:21 +0000 Message-Id: <20210204110721.33846-4-gentoo.catalyst@xxoo.ws> X-Mailer: git-send-email 2.26.2 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Archives-Salt: e6f0503a-20d5-4590-9091-2232b4ccdc95 X-Archives-Hash: de0b26852e012811513b35e5fb40575b From: Daniel Cordero On amd64 (17.1), distcc does not create /usr/lib64/distcc, despite get_libdir returning 'lib64'. Signed-off-by: Daniel Cordero --- targets/support/chroot-functions.sh | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh index 2aec018e..0c77ac75 100755 --- a/targets/support/chroot-functions.sh +++ b/targets/support/chroot-functions.sh @@ -86,12 +86,14 @@ setup_features() { # This sets up automatic cross-distcc-fu according to # https://wiki.gentoo.org/wiki/Distcc/Cross-Compiling CHOST=$(portageq envvar CHOST) - LIBDIR=$(get_libdir) - cd /usr/${LIBDIR}/distcc/bin - rm cc gcc g++ c++ 2>/dev/null - echo -e '#!/bin/bash\nexec /usr/'${LIBDIR}'/distcc/bin/'${CHOST}'-g${0:$[-2]} "$@"' > ${CHOST}-wrapper - chmod a+x /usr/${LIBDIR}/distcc/bin/${CHOST}-wrapper - for i in cc gcc g++ c++; do ln -s ${CHOST}-wrapper ${i}; done + for LIBDIR in lib $(get_libdir); do + test -d /usr/${LIBDIR}/distcc/bin || continue + cd /usr/${LIBDIR}/distcc/bin + rm cc gcc g++ c++ 2>/dev/null + echo -e '#!/bin/bash\nexec /usr/'${LIBDIR}'/distcc/bin/'${CHOST}'-g${0:$[-2]} "$@"' > ${CHOST}-wrapper + chmod a+x /usr/${LIBDIR}/distcc/bin/${CHOST}-wrapper + for i in cc gcc g++ c++; do ln -s ${CHOST}-wrapper ${i}; done + done fi if [ -n "${clst_ICECREAM}" ] @@ -174,13 +176,15 @@ setup_gcc(){ } cleanup_distcc() { - LIBDIR=$(get_libdir) - rm -rf /etc/distcc/hosts - for i in cc gcc c++ g++; do - rm -f /usr/${LIBDIR}/distcc/bin/${i} - ln -s /usr/bin/distcc /usr/${LIBDIR}/distcc/bin/${i} + rm -f /etc/distcc/hosts + for LIBDIR in lib $(get_libdir); do + test -d /usr/${LIBDIR}/distcc/bin || continue + for i in cc gcc c++ g++; do + rm -f /usr/${LIBDIR}/distcc/bin/${i} + ln -s /usr/bin/distcc /usr/${LIBDIR}/distcc/bin/${i} + done + rm -f /usr/${LIBDIR}/distcc/bin/*-wrapper done - rm -f /usr/${LIBDIR}/distcc/bin/*-wrapper } cleanup_icecream() { -- 2.26.2