diff options
Diffstat (limited to 'lang/gcc34-ada')
| -rw-r--r-- | lang/gcc34-ada/Makefile | 20 | ||||
| -rw-r--r-- | lang/gcc34-ada/buildlink3.mk | 4 | ||||
| -rw-r--r-- | lang/gcc34-ada/distinfo | 5 |
3 files changed, 14 insertions, 15 deletions
diff --git a/lang/gcc34-ada/Makefile b/lang/gcc34-ada/Makefile index b954196a163..5a4fd3b05d8 100644 --- a/lang/gcc34-ada/Makefile +++ b/lang/gcc34-ada/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.3 2004/07/26 17:28:40 shannonjr Exp $ +# $NetBSD: Makefile,v 1.4 2004/07/28 12:04:08 shannonjr Exp $ # DISTNAME= gcc-${GCC_VERSION} PKGNAME= gcc34-ada-${GCC_VERSION} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC_VERSION}/} EXTRACT_SUFX= .tar.bz2 @@ -57,9 +57,8 @@ CONFIGURE_ARGS+= --with-gnu-ld .endif # Ada bootstrap compiler section -# An Ada compiler is required to build the Ada compiler. Two -may be used: -#USE_GCC33 =# Define to use gcc-3.3.x-ada +# An Ada compiler is required to build the Ada compiler. You +# may specify: #USE_GCC34 =# Define to use gcc34 # You may also specify the path of a gcc/gnat Ada compiler # outside of the pkgsrc system by specifying the full path @@ -74,7 +73,7 @@ RALT_GCC_RTS= ${ALT_GCC_RTS:S%${LOCALBASE}%%:S%/%%} PKG_SKIP_REASON= "Missing bootstrap Ada compiler" . endif .endif -.if !defined(USE_GCC33) && !defined(USE_GCC34) && !defined(ALT_GCC) +.if !defined(USE_GCC34) && !defined(ALT_GCC) PKG_SKIP_REASON= "An Ada bootstrap compiler must be specified" .endif @@ -87,6 +86,11 @@ GCC34_PKGMODIF= ${GCC34_INSTALLTO_SUBPREFIX} GCC_SUBPREFIX= ${GCC34_INSTALLTO_SUBPREFIX} GCC_PREFIX= ${PREFIX}/${GCC_SUBPREFIX} +LOWER_OPSYS_VERSUFFIX!= echo ${LOWER_OS_VERSION} | ${CUT} -d _ -f 1 +GCC_PLATFORM= ${LOWER_ARCH}--${LOWER_OPSYS}${APPEND_ELF}${LOWER_OPSYS_VERSUFFIX} +CONFIGURE_ARGS+= --host=${GCC_PLATFORM} +GCC_ARCHSUBDIR= ${GCC_SUBPREFIX}/lib/gcc/${GCC_PLATFORM}/${GCC_VERSION} +GCC_ARCHDIR= ${PREFIX}/${GCC_ARCHSUBDIR} PLIST_SUBST+= GCC_SUBPREFIX=${GCC_SUBPREFIX} FILES_SUBST+= GCC_PREFIX=${GCC_PREFIX} FILES_SUBST+= PKGNAME=${PKGNAME} @@ -164,9 +168,7 @@ post-install: | ${SORT} -r | ${SED} -e "s,${PREFIX}/,@dirrm ,g" \ >> ${PLIST_SRC} -.if defined(USE_GCC33) -.include "../../lang/gcc3-ada/buildlink3.mk" -.elif defined(USE_GCC34) +.if defined(USE_GCC34) BUILDLINK_DEPMETHOD.gcc34= build .include "../../lang/gcc34/buildlink3.mk" .endif diff --git a/lang/gcc34-ada/buildlink3.mk b/lang/gcc34-ada/buildlink3.mk index 3280fd8f15d..b9cf4b644cb 100644 --- a/lang/gcc34-ada/buildlink3.mk +++ b/lang/gcc34-ada/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/07/01 01:35:55 shannonjr Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/07/28 12:04:08 shannonjr Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GCCADA_BUILDLINK3_MK:= ${GCCADA_BUILDLINK3_MK}+ @@ -12,7 +12,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngcc34-ada} BUILDLINK_PACKAGES+= gcc34-ada .if !empty(GCCADA_BUILDLINK3_MK:M+) -BUILDLINK_DEPENDS.gcc34-ada+= gcc34-ada>=3.4.1 +BUILDLINK_DEPENDS.gcc34-ada+= gcc34-ada>=3.4.1nb2 BUILDLINK_PKGSRCDIR.gcc34-ada?= ../../lang/gcc34-ada BUILDLINK_ENV+= ADAC=${BUILDLINK_PREFIX.gcc34-ada}/bin/gcc . if exists(${BUILDLINK_PREFIX.gcc34-ada}/bin/gcc) diff --git a/lang/gcc34-ada/distinfo b/lang/gcc34-ada/distinfo index 3a345c61b75..e89e5119a89 100644 --- a/lang/gcc34-ada/distinfo +++ b/lang/gcc34-ada/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2004/07/26 17:28:40 shannonjr Exp $ +$NetBSD: distinfo,v 1.4 2004/07/28 12:04:08 shannonjr Exp $ SHA1 (gcc-3.4.1.tar.bz2) = 04de377eff57e614b089b8946a520de0dac7248e Size (gcc-3.4.1.tar.bz2) = 27182385 bytes @@ -8,6 +8,3 @@ SHA1 (patch-ag) = beee5294d387faafa640ab048823499da629e715 SHA1 (patch-ba) = 6fc03fc155f630329f7dc831eece6b6464b453a6 SHA1 (patch-bb) = aa088194fb073fcde8d2f558ed55ec36106d60d0 SHA1 (patch-ca) = 771c14ce8cdd9e631694cd19108419f4003a6c08 -SHA1 (patch-function_c) = 64398f40f62ad4c8b9c8f861b802403a4f5aa3be -SHA1 (patch-libstdc++-v3_configure_host) = f680066ac285cd9cd3fea6713ce3e8a6d0e1c14c -SHA1 (patch-varasm) = 3dfe9a56ebd464d573104511e63dc3599ab5c834 |