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 54B21138334 for ; Fri, 22 Nov 2019 12:03:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 84BB7E0801; Fri, 22 Nov 2019 12:03:54 +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 599CDE0801 for ; Fri, 22 Nov 2019 12:03:54 +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 05CCC34D209 for ; Fri, 22 Nov 2019 12:03:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5CC0B744 for ; Fri, 22 Nov 2019 12:03:51 +0000 (UTC) From: "Alfredo Tupone" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alfredo Tupone" Message-ID: <1574424208.4278685f5e478d0b89859deaa2dcca88780c797e.tupone@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/gnat-gpl/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/gnat-gpl/gnat-gpl-2016-r4.ebuild dev-lang/gnat-gpl/gnat-gpl-2017-r1.ebuild dev-lang/gnat-gpl/gnat-gpl-2018-r3.ebuild dev-lang/gnat-gpl/gnat-gpl-2019-r1.ebuild X-VCS-Directories: dev-lang/gnat-gpl/ X-VCS-Committer: tupone X-VCS-Committer-Name: Alfredo Tupone X-VCS-Revision: 4278685f5e478d0b89859deaa2dcca88780c797e X-VCS-Branch: master Date: Fri, 22 Nov 2019 12:03:51 +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: 4ea3ce95-8f6c-455a-ab28-9a7fb77ca64e X-Archives-Hash: 9e4d097e7a77ecebc76f22aa296038b0 commit: 4278685f5e478d0b89859deaa2dcca88780c797e Author: Tupone Alfredo gentoo org> AuthorDate: Fri Nov 22 12:02:54 2019 +0000 Commit: Alfredo Tupone gentoo org> CommitDate: Fri Nov 22 12:03:28 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4278685f dev-lang/gnat-gpl: put a guards against tool renaming made twice Package-Manager: Portage-2.3.76, Repoman-2.3.16 Signed-off-by: Alfredo Tupone gentoo.org> dev-lang/gnat-gpl/gnat-gpl-2016-r4.ebuild | 11 ++++++----- dev-lang/gnat-gpl/gnat-gpl-2017-r1.ebuild | 11 ++++++----- dev-lang/gnat-gpl/gnat-gpl-2018-r3.ebuild | 11 ++++++----- dev-lang/gnat-gpl/gnat-gpl-2019-r1.ebuild | 11 ++++++----- 4 files changed, 24 insertions(+), 20 deletions(-) diff --git a/dev-lang/gnat-gpl/gnat-gpl-2016-r4.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2016-r4.ebuild index 2cbd328b448..290798ee35e 100644 --- a/dev-lang/gnat-gpl/gnat-gpl-2016-r4.ebuild +++ b/dev-lang/gnat-gpl/gnat-gpl-2016-r4.ebuild @@ -172,6 +172,9 @@ src_compile() { src_install() { toolchain_src_install cd "${D}"${BINPATH} + if [[ -h gnatmake-${GCC_CONFIG_VER} ]] ; then + return + fi for x in gnat*; do # For some reason, g77 gets made instead of ${CTARGET}-g77... # this should take care of that @@ -183,11 +186,9 @@ src_install() { fi if [[ -f ${CTARGET}-${x} ]] ; then - if ! is_crosscompile ; then - ln -sf ${CTARGET}-${x} ${x} - dosym ${BINPATH#${EPREFIX}}/${CTARGET}-${x} \ - /usr/bin/${x}-${GCC_CONFIG_VER} - fi + ln -sf ${CTARGET}-${x} ${x} + dosym ${BINPATH#${EPREFIX}}/${CTARGET}-${x} \ + /usr/bin/${x}-${GCC_CONFIG_VER} # Create versioned symlinks dosym ${BINPATH#${EPREFIX}}/${CTARGET}-${x} \ /usr/bin/${CTARGET}-${x}-${GCC_CONFIG_VER} diff --git a/dev-lang/gnat-gpl/gnat-gpl-2017-r1.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2017-r1.ebuild index 0ea6d3ee076..8d63c01d4ee 100644 --- a/dev-lang/gnat-gpl/gnat-gpl-2017-r1.ebuild +++ b/dev-lang/gnat-gpl/gnat-gpl-2017-r1.ebuild @@ -154,6 +154,9 @@ src_compile() { src_install() { toolchain_src_install cd "${D}"${BINPATH} + if [[ -h gnatmake-${GCC_CONFIG_VER} ]] ; then + return + fi for x in gnat*; do # For some reason, g77 gets made instead of ${CTARGET}-g77... # this should take care of that @@ -165,11 +168,9 @@ src_install() { fi if [[ -f ${CTARGET}-${x} ]] ; then - if ! is_crosscompile ; then - ln -sf ${CTARGET}-${x} ${x} - dosym ${BINPATH#${EPREFIX}}/${CTARGET}-${x} \ - /usr/bin/${x}-${GCC_CONFIG_VER} - fi + ln -sf ${CTARGET}-${x} ${x} + dosym ${BINPATH#${EPREFIX}}/${CTARGET}-${x} \ + /usr/bin/${x}-${GCC_CONFIG_VER} # Create versioned symlinks dosym ${BINPATH#${EPREFIX}}/${CTARGET}-${x} \ /usr/bin/${CTARGET}-${x}-${GCC_CONFIG_VER} diff --git a/dev-lang/gnat-gpl/gnat-gpl-2018-r3.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2018-r3.ebuild index 00f3295d1ce..1e8dadcdd4d 100644 --- a/dev-lang/gnat-gpl/gnat-gpl-2018-r3.ebuild +++ b/dev-lang/gnat-gpl/gnat-gpl-2018-r3.ebuild @@ -154,6 +154,9 @@ src_compile() { src_install() { toolchain_src_install cd "${D}"${BINPATH} + if [[ -h gnatmake-${GCC_CONFIG_VER} ]] ; then + return + fi for x in gnat*; do # For some reason, g77 gets made instead of ${CTARGET}-g77... # this should take care of that @@ -165,11 +168,9 @@ src_install() { fi if [[ -f ${CTARGET}-${x} ]] ; then - if ! is_crosscompile ; then - ln -sf ${CTARGET}-${x} ${x} - dosym ${BINPATH#${EPREFIX}}/${CTARGET}-${x} \ - /usr/bin/${x}-${GCC_CONFIG_VER} - fi + ln -sf ${CTARGET}-${x} ${x} + dosym ${BINPATH#${EPREFIX}}/${CTARGET}-${x} \ + /usr/bin/${x}-${GCC_CONFIG_VER} # Create versioned symlinks dosym ${BINPATH#${EPREFIX}}/${CTARGET}-${x} \ /usr/bin/${CTARGET}-${x}-${GCC_CONFIG_VER} diff --git a/dev-lang/gnat-gpl/gnat-gpl-2019-r1.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2019-r1.ebuild index fe915188aa1..ec50a7c0fb5 100644 --- a/dev-lang/gnat-gpl/gnat-gpl-2019-r1.ebuild +++ b/dev-lang/gnat-gpl/gnat-gpl-2019-r1.ebuild @@ -153,6 +153,9 @@ src_compile() { src_install() { toolchain_src_install cd "${D}"${BINPATH} + if [[ -h gnatmake-${GCC_CONFIG_VER} ]] ; then + return + fi for x in gnat*; do # For some reason, g77 gets made instead of ${CTARGET}-g77... # this should take care of that @@ -164,11 +167,9 @@ src_install() { fi if [[ -f ${CTARGET}-${x} ]] ; then - if ! is_crosscompile ; then - ln -sf ${CTARGET}-${x} ${x} - dosym ${BINPATH#${EPREFIX}}/${CTARGET}-${x} \ - /usr/bin/${x}-${GCC_CONFIG_VER} - fi + ln -sf ${CTARGET}-${x} ${x} + dosym ${BINPATH#${EPREFIX}}/${CTARGET}-${x} \ + /usr/bin/${x}-${GCC_CONFIG_VER} # Create versioned symlinks dosym ${BINPATH#${EPREFIX}}/${CTARGET}-${x} \ /usr/bin/${CTARGET}-${x}-${GCC_CONFIG_VER}