fix bootstrap for ada and -current

This commit is contained in:
espie 2008-08-20 09:56:17 +00:00
parent aa91ec9df8
commit 8b52dc2b17
2 changed files with 22 additions and 8 deletions

View File

@ -1,10 +1,12 @@
# $OpenBSD: Makefile,v 1.31 2008/07/25 20:50:26 martynas Exp $ # $OpenBSD: Makefile,v 1.32 2008/08/20 09:56:17 espie Exp $
ONLY_FOR_ARCHS= alpha i386 m68k sparc sparc64 powerpc vax ONLY_FOR_ARCHS= alpha i386 m68k sparc sparc64 powerpc vax
V=3.3.6 V=3.3.6
FULL_VERSION=3.3.6 FULL_VERSION=3.3.6
FULL_PKGVERSION=3.3.6 FULL_PKGVERSION=3.3.6
BOOTSTRAP_GEN = 6
ADASTRAP = adastrap-i386-3.3.6-${BOOTSTRAP_GEN}.tgz
PKGNAME-main= gcc-${FULL_PKGVERSION}p10 PKGNAME-main= gcc-${FULL_PKGVERSION}p10
PKGNAME-c++ = g++-${FULL_PKGVERSION}p10 PKGNAME-c++ = g++-${FULL_PKGVERSION}p10
@ -58,7 +60,7 @@ REGRESS_DEPENDS=::devel/dejagnu
DISTNAME= gcc-${FULL_VERSION} DISTNAME= gcc-${FULL_VERSION}
DISTFILES= ${DISTNAME}.tar.bz2 DISTFILES= ${DISTNAME}.tar.bz2
SUPDISTFILES=adastrap-i386-3.3.6-5.tgz:0 SUPDISTFILES=${ADASTRAP}:0
MASTER_SITES= ${MASTER_SITE_GCC:=releases/gcc-$(FULL_VERSION)/} MASTER_SITES= ${MASTER_SITE_GCC:=releases/gcc-$(FULL_VERSION)/}
MASTER_SITES0= ftp://quatramaran.ens.fr/pub/espie/ MASTER_SITES0= ftp://quatramaran.ens.fr/pub/espie/
@ -92,7 +94,7 @@ CONFIGURE_ARGS+=--enable-java-gc=system-boehm
.if ${FLAVOR:L:Mada} .if ${FLAVOR:L:Mada}
LANGS:=${LANGS},ada LANGS:=${LANGS},ada
MULTI_PACKAGES+=-ada MULTI_PACKAGES+=-ada
DISTFILES+=adastrap-${MACHINE_ARCH}-3.3.6-5.tgz:0 DISTFILES+=${ADASTRAP}:0
CONFIGURE_ENV=ADAC=${WRKDIR}/bin/egcc GNATBIND=${WRKDIR}/bin/gnatbind CONFIGURE_ENV=ADAC=${WRKDIR}/bin/egcc GNATBIND=${WRKDIR}/bin/gnatbind
MAKE_ENV=ADAC=${WRKDIR}/bin/egcc GNATBIND=${WRKDIR}/bin/gnatbind MAKE_ENV=ADAC=${WRKDIR}/bin/egcc GNATBIND=${WRKDIR}/bin/gnatbind
@ -178,4 +180,16 @@ LIB_DEPENDS-java=gc::devel/boehm-gc
RUN_DEPENDS-c++ =${RUN_DEPENDS} ::${PKGPATH},-estdc RUN_DEPENDS-c++ =${RUN_DEPENDS} ::${PKGPATH},-estdc
.include <bsd.port.mk> .include <bsd.port.mk>
ADA_PACKAGE=${PACKAGE_REPOSITORY}/i386/all/${PKGNAME-ada}${PKG_SUFX}
GCC_PACKAGE=${PACKAGE_REPOSITORY}/i386/all/${PKGNAME-main}${PKG_SUFX}
adastrap: ${ADA_PACKAGE} ${GCC_PACKAGE}
mkdir -p ${WRKDIR}/prepare/bootstrap
cd ${WRKDIR}/prepare/bootstrap && tar zxf ${ADA_PACKAGE}
cd ${WRKDIR}/prepare/bootstrap && tar zxf ${GCC_PACKAGE}
rm -rf ${WRKDIR}/prepare/bootstrap/{+*,info,man}
cd ${WRKDIR}/prepare && tar zcf ${FULLDISTDIR}/${ADASTRAP} bootstrap

View File

@ -1,10 +1,10 @@
MD5 (gcc/adastrap-i386-3.3.6-5.tgz) = 9NDKxgH0XjlJIgv1mleWZg== MD5 (gcc/adastrap-i386-3.3.6-6.tgz) = uMZ4W+jTEsT0KwA7evkAAA==
MD5 (gcc/gcc-3.3.6.tar.bz2) = aTZhapZ9paC0bx50JKBkFA== MD5 (gcc/gcc-3.3.6.tar.bz2) = aTZhapZ9paC0bx50JKBkFA==
RMD160 (gcc/adastrap-i386-3.3.6-5.tgz) = yXkkH1E/+UAnEVpUVQehfZFHPA0= RMD160 (gcc/adastrap-i386-3.3.6-6.tgz) = Nnl6VwzW1s50Btfm9aadTNyZjd8=
RMD160 (gcc/gcc-3.3.6.tar.bz2) = syx6CMaQhX8KxS3aPetHz1d12Wc= RMD160 (gcc/gcc-3.3.6.tar.bz2) = syx6CMaQhX8KxS3aPetHz1d12Wc=
SHA1 (gcc/adastrap-i386-3.3.6-5.tgz) = 9Uo7+CvT1PIkP6F1rZF6fpfUN7M= SHA1 (gcc/adastrap-i386-3.3.6-6.tgz) = 1DuV7/n0iAj7em3PyY1ONZ26lYA=
SHA1 (gcc/gcc-3.3.6.tar.bz2) = LMQ5eLsJr2wsz990eX0Q18wllvs= SHA1 (gcc/gcc-3.3.6.tar.bz2) = LMQ5eLsJr2wsz990eX0Q18wllvs=
SHA256 (gcc/adastrap-i386-3.3.6-5.tgz) = 478BEeFZ3dAapXS3l8j2OcMomN1r2FIz3+adDzmjj/g= SHA256 (gcc/adastrap-i386-3.3.6-6.tgz) = 9mqersGOdjbexlJtO13+xsVL6k98i8i90lHS2CsYsoA=
SHA256 (gcc/gcc-3.3.6.tar.bz2) = HBqlM8Z+naXlXtT1c2JY3HU0Zr1xa9rj+4j7Zub/HX8= SHA256 (gcc/gcc-3.3.6.tar.bz2) = HBqlM8Z+naXlXtT1c2JY3HU0Zr1xa9rj+4j7Zub/HX8=
SIZE (gcc/adastrap-i386-3.3.6-5.tgz) = 16790512 SIZE (gcc/adastrap-i386-3.3.6-6.tgz) = 16795699
SIZE (gcc/gcc-3.3.6.tar.bz2) = 23972413 SIZE (gcc/gcc-3.3.6.tar.bz2) = 23972413