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 7CB2A1382C5 for ; Fri, 5 Jan 2018 07:51:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CF3F4E0B83; Fri, 5 Jan 2018 07:51:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 AF537E0B83 for ; Fri, 5 Jan 2018 07:51:40 +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 BF168335C07 for ; Fri, 5 Jan 2018 07:51:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 13DC0145 for ; Fri, 5 Jan 2018 07:51:37 +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: <1515138693.85352f772d456ba2c7234e5f3d0af49425857844.grobian@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/gcc-apple/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r2.ebuild X-VCS-Directories: sys-devel/gcc-apple/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 85352f772d456ba2c7234e5f3d0af49425857844 X-VCS-Branch: master Date: Fri, 5 Jan 2018 07:51:37 +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: 95b22a61-884c-45c9-aa87-26221f91fec2 X-Archives-Hash: 603a7f7c8c413bca3d5e74da8b370c5e commit: 85352f772d456ba2c7234e5f3d0af49425857844 Author: Fabian Groffen gentoo org> AuthorDate: Fri Jan 5 07:51:08 2018 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Fri Jan 5 07:51:33 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85352f77 sys-devel/gcc-apple: use relative symlinks with dosym Package-Manager: Portage-2.3.13, Repoman-2.3.3 sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r2.ebuild | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r2.ebuild b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r2.ebuild index bd1d1120995..12f3d99760d 100644 --- a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r2.ebuild +++ b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -138,6 +138,7 @@ src_prepare() { local BRANDING_GCC_PKGVERSION="$(sed -n -e '/^#define VERSUFFIX/s/^[^"]*"\([^"]\+\)".*$/\1/p' "${S}"/gcc/version.c)" BRANDING_GCC_PKGVERSION=${BRANDING_GCC_PKGVERSION/(/(Gentoo ${PVR}, } + # ) ) } # <- to help Vim highlight this correctly einfo "patching gcc version: ${GCC_VERS}${BRANDING_GCC_PKGVERSION}" sed -i -e "s~VERSUFFIX \"[^\"]*~VERSUFFIX \"${BRANDING_GCC_PKGVERSION}~" \ @@ -314,9 +315,9 @@ src_install() { ln -sf ${CTARGET}-${x} ${x} # Create version-ed symlinks - dosym ${BINPATH#${EPREFIX}}/${CTARGET}-${x} \ + dosym ../${BINPATH#${EPREFIX}/usr/}/${CTARGET}-${x} \ /usr/bin/${CTARGET}-${x}-${GCC_VERS} - dosym ${BINPATH#${EPREFIX}}/${CTARGET}-${x} \ + dosym ../${BINPATH#${EPREFIX}/usr/}/${CTARGET}-${x} \ /usr/bin/${x}-${GCC_VERS} fi