[pkgsrc/trunk]: pkgsrc/lang/gcc34-ada Bring inline with gcc34 pkg by incompor...

[shannonjr <shannonjr%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/41c904df1fc9
branches:  trunk
changeset: 479318:41c904df1fc9
user:      shannonjr <shannonjr%pkgsrc.org@localhost>
date:      Wed Aug 11 22:45:00 2004 +0000

description:
Bring inline with gcc34 pkg by incomporating the following changes
already in lang/gcc34:
1) Locate adalib for bootstrap compiler with ${ALT_GCC} --print-file-name=adalib
   rather than find. This behaves better if ${ALT_GCC} does not specify
   a gcc executable.
2) Elide trailing letters from GCC_PLATFORM so that GCC_ARCHSUBDIR
   remains constant for CURRENT when the version letter changes.

diffstat:

 lang/gcc34-ada/Makefile |  11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diffs (33 lines):

diff -r c17ce5f850a7 -r 41c904df1fc9 lang/gcc34-ada/Makefile
--- a/lang/gcc34-ada/Makefile   Wed Aug 11 22:16:54 2004 +0000
+++ b/lang/gcc34-ada/Makefile   Wed Aug 11 22:45:00 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/08/08 11:14:37 shannonjr Exp $
+# $NetBSD: Makefile,v 1.8 2004/08/11 22:45:00 shannonjr Exp $
 #
 
 DISTNAME=      gcc-${GCC_VERSION}
@@ -67,9 +67,12 @@
 #ALT_GCC=      prefix/bin/gcc
 .if defined(ALT_GCC)
 .      if exists(${ALT_GCC})
-ALT_GCC_PREFIX:=       ${ALT_GCC:H}/..
-ALT_GCC_RTS!=  ${FIND} ${ALT_GCC_PREFIX} -name adalib
+ALT_GCC_RTS!=  ${ALT_GCC} --print-file-name=adalib
+.        if !empty(ALT_GCC_RTS)
 RALT_GCC_RTS=  ${ALT_GCC_RTS:S%${LOCALBASE}%%:S%/%%}
+.        else
+PKG_SKIP_REASON=       "${ALT_GCC} does not appear to be an Ada compiler"
+.        endif
 .      else
 PKG_SKIP_REASON=       "Missing bootstrap Ada compiler"
 .      endif
@@ -87,7 +90,7 @@
 
 GCC_SUBPREFIX=         ${GCC34_INSTALLTO_SUBPREFIX}
 GCC_PREFIX=            ${PREFIX}/${GCC_SUBPREFIX}
-GCC_PLATFORM=          ${LOWER_ARCH}--${LOWER_OPSYS}${APPEND_ELF}${LOWER_OS_VERSION:C/_.*//}
+GCC_PLATFORM=          ${LOWER_ARCH}--${LOWER_OPSYS}${APPEND_ELF}${LOWER_OS_VERSION:C/[_a-z].*//}
 CONFIGURE_ARGS+=       --host=${GCC_PLATFORM}
 GCC_ARCHSUBDIR=                ${GCC_SUBPREFIX}/lib/gcc/${GCC_PLATFORM}/${GCC_VERSION}
 GCC_ARCHDIR=           ${PREFIX}/${GCC_ARCHSUBDIR}