From owner-svn-ports-head@FreeBSD.ORG Thu Jan 23 20:46:16 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F32ABDD7; Thu, 23 Jan 2014 20:46:15 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id DEBBB1903; Thu, 23 Jan 2014 20:46:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0NKkFHo021140; Thu, 23 Jan 2014 20:46:15 GMT (envelope-from marino@svn.freebsd.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0NKkFd9021133; Thu, 23 Jan 2014 20:46:15 GMT (envelope-from marino@svn.freebsd.org) Message-Id: <201401232046.s0NKkFd9021133@svn.freebsd.org> From: John Marino Date: Thu, 23 Jan 2014 20:46:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r340860 - in head/lang: gnatdroid-armv5 gnatdroid-armv7 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Jan 2014 20:46:16 -0000 Author: marino Date: Thu Jan 23 20:46:14 2014 New Revision: 340860 URL: http://svnweb.freebsd.org/changeset/ports/340860 QAT: https://qat.redports.org/buildarchive/r340860/ Log: lang/gnatdroid-armv(5,7): Use lang/gcc-aux as base, not lang/gnat-aux After a few additional patches for gcc-aux, gnatdroid-armv5 (and -armv7) build and execute well when built and based on gcc 4.7-based gcc-aux. The previous version was based on gcc 4.6-based gnat-aux. This was the final port requiring gnat-aux, and now its part of the Ada framework. Running acats using an ASUS Transformer XF101 (Android 4.0.3) as a target results in a nearly perfect result. Only test cb1010a fails, which is a failure to detect running out of stack space (-fstack-check). I intend to investigate further, but as the only problem, gnatdroid remains a highly capable compiler despite the small regression. Potentially zero-cost exceptions were gained as a trade-off. Deleted: head/lang/gnatdroid-armv5/distinfo head/lang/gnatdroid-armv7/distinfo Modified: head/lang/gnatdroid-armv5/Makefile head/lang/gnatdroid-armv5/pkg-descr head/lang/gnatdroid-armv7/Makefile head/lang/gnatdroid-armv7/pkg-descr Modified: head/lang/gnatdroid-armv5/Makefile ============================================================================== --- head/lang/gnatdroid-armv5/Makefile Thu Jan 23 20:16:57 2014 (r340859) +++ head/lang/gnatdroid-armv5/Makefile Thu Jan 23 20:46:14 2014 (r340860) @@ -3,15 +3,12 @@ PORTNAME= armv5 PORTVERSION= ${SNAPSHOT} -PORTREVISION= 2 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_GCC} MASTER_SITE_SUBDIR= releases/gcc-${GCC_VERSION} PKGNAMEPREFIX= gnatdroid- DISTNAME= arm-gnat-${PORTVERSION} -DISTFILES= gcc-core-${GCC_VERSION}.tar.bz2 \ - gcc-ada-${GCC_VERSION}.tar.bz2 \ - gcc-testsuite-${GCC_VERSION}.tar.bz2 +DISTFILES= gcc-${GCC_VERSION}.tar.bz2 MAINTAINER= marino@FreeBSD.org COMMENT= C/Ada cross-compiler, target: Android ARMv5 @@ -19,18 +16,22 @@ COMMENT= C/Ada cross-compiler, target: A LICENSE= GPLv3 BUILD_DEPENDS= gnatdroid-sysroot>=9:${PORTSDIR}/lang/gnatdroid-sysroot \ - gnatdroid-binutils>=2.21:${PORTSDIR}/lang/gnatdroid-binutils \ - gnat-aux>=20110325:${PORTSDIR}/lang/gnat-aux -RUN_DEPENDS:= gnatdroid-sysroot>=9:${PORTSDIR}/lang/gnatdroid-sysroot \ gnatdroid-binutils>=2.21:${PORTSDIR}/lang/gnatdroid-binutils +RUN_DEPENDS:= ${BUILD_DEPENDS} NO_LICENSES_INSTALL= yes -.include "${.CURDIR}/../gnat-aux/Makefile.common" +.include "${.CURDIR}/../gcc-aux/Makefile.common" +# DELETE NEXT LINE AFTER NEXT UPDATE TO GCC-AUX 4.7 TO AVOID PORTEPOCH +# Without it, this port version regresses by a day +SNAPSHOT:= 20130413 # last portversion + 1 + +USES+= ada gmake LANGS= c ada APPLY_DIFFS= core ada ada-testsuite gcc-testsuite NO_MTREE= YES +DISTINFO_FILE= ${.CURDIR}/../gcc-aux/distinfo # Disable C++ until arm.cc/no-rtti issue resolved for libsupc++ @@ -47,12 +48,11 @@ ARMVERSION= ARMv5 FPU= vfp WRKSRC= ${WRKDIR}/gcc-${GCC_VERSION} BUILD_WRKSRC= ${WRKDIR}/build -PATCHDIR= ${.CURDIR}/../gnat-aux/files +PATCHDIR= ${.CURDIR}/../gcc-aux/files CFG_SCRIPT= ${WRKSRC}/configure REVFILE= ${WRKSRC}/gcc/REVISION SRPREFIX= ${LOCALBASE}/android9 PREFIX= ${SRPREFIX}/${ARMVERSION} -FULL_GNATGCC= ${LOCALBASE}/bin/gnatgcc INSTALLDIRS= lib libexec share INSTALLDIRS+= ${DROID_TARGET}/lib PLIST_SUB+= TARGET="${DROID_TARGET}" @@ -60,7 +60,6 @@ PLIST_SUB+= GCCVERS="${GCC_VERSION}" SUB_FILES= pkg-message SUB_LIST= TARGET="${DROID_TARGET}" -ADA_CONFIGURE_ENV= CC=${FULL_GNATGCC} ALL_TARGET= all .include @@ -78,7 +77,6 @@ OS_LABEL4VERS= "[${OPSYS}32 x Android ${ .if ${PORT_OPTIONS:MCXX} LANGS+= c++ APPLY_DIFFS+= cxx cxx-testsuite -DISTFILES+= gcc-g++-${GCC_VERSION}.tar.bz2 INSTALLDIRS+= include/c++/${GCC_VERSION} .endif @@ -89,7 +87,6 @@ INSTALLDIRS+= include/c++/${GCC_VERSION} .if ${PORT_OPTIONS:MFORT} LANGS+= fortran APPLY_DIFFS+= fortran -DISTFILES+= gcc-fortran-${GCC_VERSION}.tar.bz2 .endif ################### @@ -98,7 +95,6 @@ DISTFILES+= gcc-fortran-${GCC_VERSION}.t .if ${PORT_OPTIONS:MOBJC} LANGS+= objc -DISTFILES+= gcc-objc-${GCC_VERSION}.tar.bz2 .endif CONFIGURE_ARGS= --enable-languages=${LANGS:Q} @@ -144,7 +140,7 @@ post-extract: do-configure: ${MKDIR} ${BUILD_WRKSRC} - cd ${BUILD_WRKSRC} && ${SETENV} ${ADA_CONFIGURE_ENV} \ + cd ${BUILD_WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ ${CFG_SCRIPT} ${CONFIGURE_ARGS} pre-install: Modified: head/lang/gnatdroid-armv5/pkg-descr ============================================================================== --- head/lang/gnatdroid-armv5/pkg-descr Thu Jan 23 20:16:57 2014 (r340859) +++ head/lang/gnatdroid-armv5/pkg-descr Thu Jan 23 20:46:14 2014 (r340860) @@ -1,4 +1,4 @@ -The gnatdroid-armv5 port builds a C/Ada cross-compiler based on GCC 4.6 that +The gnatdroid-armv5 port builds a C/Ada cross-compiler based on GCC 4.7 that targets the Android operating system (version 2.3, API level 9) running on ARM architecture (version 5). This produces binaries that run natively on Android devices as well as the Android SDK emulator. Modified: head/lang/gnatdroid-armv7/Makefile ============================================================================== --- head/lang/gnatdroid-armv7/Makefile Thu Jan 23 20:16:57 2014 (r340859) +++ head/lang/gnatdroid-armv7/Makefile Thu Jan 23 20:46:14 2014 (r340860) @@ -3,15 +3,12 @@ PORTNAME= armv7 PORTVERSION= ${SNAPSHOT} -PORTREVISION= 2 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_GCC} MASTER_SITE_SUBDIR= releases/gcc-${GCC_VERSION} PKGNAMEPREFIX= gnatdroid- DISTNAME= arm-gnat-${PORTVERSION} -DISTFILES= gcc-core-${GCC_VERSION}.tar.bz2 \ - gcc-ada-${GCC_VERSION}.tar.bz2 \ - gcc-testsuite-${GCC_VERSION}.tar.bz2 +DISTFILES= gcc-${GCC_VERSION}.tar.bz2 MAINTAINER= marino@FreeBSD.org COMMENT= C/Ada cross-compiler, target: Android ARMv7 @@ -19,18 +16,22 @@ COMMENT= C/Ada cross-compiler, target: A LICENSE= GPLv3 BUILD_DEPENDS= gnatdroid-sysroot>=9:${PORTSDIR}/lang/gnatdroid-sysroot \ - gnatdroid-binutils>=2.21:${PORTSDIR}/lang/gnatdroid-binutils \ - gnat-aux>=20110325:${PORTSDIR}/lang/gnat-aux -RUN_DEPENDS:= gnatdroid-sysroot>=9:${PORTSDIR}/lang/gnatdroid-sysroot \ gnatdroid-binutils>=2.21:${PORTSDIR}/lang/gnatdroid-binutils +RUN_DEPENDS:= ${BUILD_DEPENDS} NO_LICENSES_INSTALL= yes -.include "${.CURDIR}/../gnat-aux/Makefile.common" +.include "${.CURDIR}/../gcc-aux/Makefile.common" +# DELETE NEXT LINE AFTER NEXT UPDATE TO GCC-AUX 4.7 TO AVOID PORTEPOCH +# Without it, this port version regresses by a day +SNAPSHOT:= 20130413 # last portversion + 1 + +USES+= ada gmake LANGS= c ada APPLY_DIFFS= core ada ada-testsuite gcc-testsuite NO_MTREE= YES +DISTINFO_FILE= ${.CURDIR}/../gcc-aux/distinfo # Disable C++ until arm.cc/no-rtti issue resolved for libsupc++ @@ -47,12 +48,11 @@ ARMVERSION= ARMv7 FPU= neon WRKSRC= ${WRKDIR}/gcc-${GCC_VERSION} BUILD_WRKSRC= ${WRKDIR}/build -PATCHDIR= ${.CURDIR}/../gnat-aux/files +PATCHDIR= ${.CURDIR}/../gcc-aux/files CFG_SCRIPT= ${WRKSRC}/configure REVFILE= ${WRKSRC}/gcc/REVISION SRPREFIX= ${LOCALBASE}/android9 PREFIX= ${SRPREFIX}/${ARMVERSION} -FULL_GNATGCC= ${LOCALBASE}/bin/gnatgcc INSTALLDIRS= lib libexec share INSTALLDIRS+= ${DROID_TARGET}/lib PLIST_SUB+= TARGET="${DROID_TARGET}" @@ -60,7 +60,6 @@ PLIST_SUB+= GCCVERS="${GCC_VERSION}" SUB_FILES= pkg-message SUB_LIST= TARGET="${DROID_TARGET}" -ADA_CONFIGURE_ENV= CC=${FULL_GNATGCC} ALL_TARGET= all .include @@ -78,7 +77,6 @@ OS_LABEL4VERS= "[${OPSYS}32 x Android ${ .if ${PORT_OPTIONS:MCXX} LANGS+= c++ APPLY_DIFFS+= cxx cxx-testsuite -DISTFILES+= gcc-g++-${GCC_VERSION}.tar.bz2 INSTALLDIRS+= include/c++/${GCC_VERSION} .endif @@ -89,7 +87,6 @@ INSTALLDIRS+= include/c++/${GCC_VERSION} .if ${PORT_OPTIONS:MFORT} LANGS+= fortran APPLY_DIFFS+= fortran -DISTFILES+= gcc-fortran-${GCC_VERSION}.tar.bz2 .endif ################### @@ -98,7 +95,6 @@ DISTFILES+= gcc-fortran-${GCC_VERSION}.t .if ${PORT_OPTIONS:MOBJC} LANGS+= objc -DISTFILES+= gcc-objc-${GCC_VERSION}.tar.bz2 .endif CONFIGURE_ARGS= --enable-languages=${LANGS:Q} @@ -144,7 +140,7 @@ post-extract: do-configure: ${MKDIR} ${BUILD_WRKSRC} - cd ${BUILD_WRKSRC} && ${SETENV} ${ADA_CONFIGURE_ENV} \ + cd ${BUILD_WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ ${CFG_SCRIPT} ${CONFIGURE_ARGS} pre-install: Modified: head/lang/gnatdroid-armv7/pkg-descr ============================================================================== --- head/lang/gnatdroid-armv7/pkg-descr Thu Jan 23 20:16:57 2014 (r340859) +++ head/lang/gnatdroid-armv7/pkg-descr Thu Jan 23 20:46:14 2014 (r340860) @@ -1,4 +1,4 @@ -The gnatdroid-armv7 port builds a C/Ada cross-compiler based on GCC 4.6 that +The gnatdroid-armv7 port builds a C/Ada cross-compiler based on GCC 4.7 that targets the Android operating system (version 2.3, API level 9) running on ARM architecture (version 7). This produces binaries that run natively on Android devices built with Cortex-A series chips.