commit: 4278685f5e478d0b89859deaa2dcca88780c797e
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 22 12:02:54 2019 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> 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 <tupone <AT> 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}
