svn commit: r411236 - in head/lang: gnatdroid-armv7 gnatdroid-sysroot gnatdroid-sysroot-x86 gnatdroid-x86
John Marino
marino at FreeBSD.org
Wed Mar 16 14:36:13 UTC 2016
Author: marino
Date: Wed Mar 16 14:36:10 2016
New Revision: 411236
URL: https://svnweb.freebsd.org/changeset/ports/411236
Log:
Rebase gnatdroid to gcc6-aux (6.0), add support for MARSHMELLOW
The gnatdroid cross-compilers (*BSD => Android) were the last two users
of gcc-aux (gcc 4.9 Ada compiler). They are now based on gcc6-aux.
The Android NDK release 11 just came out with support for Android API 23
(Marshmellow) so now gnatdroid supports it. I removed API 8 and 9
(Froyo and Gingerbread) from gnatdroid-armv7. Froyo currently is installed
on less than 0.1% of Android devices, and Gingerbread is dropping under 2%
soon. Many sysroot distfiles were re-rolled to gain required headers, so
a distfiles subdirectory was added as well.
Modified:
head/lang/gnatdroid-armv7/Makefile
head/lang/gnatdroid-armv7/pkg-descr
head/lang/gnatdroid-armv7/pkg-plist
head/lang/gnatdroid-sysroot-x86/Makefile
head/lang/gnatdroid-sysroot-x86/distinfo
head/lang/gnatdroid-sysroot-x86/pkg-descr
head/lang/gnatdroid-sysroot/Makefile
head/lang/gnatdroid-sysroot/distinfo
head/lang/gnatdroid-sysroot/pkg-descr
head/lang/gnatdroid-x86/pkg-descr
Modified: head/lang/gnatdroid-armv7/Makefile
==============================================================================
--- head/lang/gnatdroid-armv7/Makefile Wed Mar 16 13:33:52 2016 (r411235)
+++ head/lang/gnatdroid-armv7/Makefile Wed Mar 16 14:36:10 2016 (r411236)
@@ -20,14 +20,15 @@ BUILD_DEPENDS= ${SYSROOT}>=19:${PORTSDIR
RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_LICENSES_INSTALL= yes
+AUXPORT= gcc6-aux
-.include "${.CURDIR}/../gcc-aux/Makefile.common"
+.include "${.CURDIR}/../${AUXPORT}/Makefile.common"
-USES+= ada:49 gmake
+USES+= ada:6 gmake
LANGS= c c++ ada
APPLY_DIFFS= core ada cxx ada-testsuite
NO_MTREE= YES
-DISTINFO_FILE= ${.CURDIR}/../gcc-aux/distinfo
+DISTINFO_FILE= ${.CURDIR}/../${AUXPORT}/distinfo
OPTIONS_DEFINE= FORT OBJC
OPTIONS_SUB= yes
@@ -45,7 +46,7 @@ BITS= ${GARCH:S/x86_64/64/:S/i386/32/}
OS_LABEL4VERS= [${OPSYS}${BITS} x Android ${CPUVERSION}]
WRKSRC= ${WRKDIR}/${IDENTIFICATION}
BUILD_WRKSRC= ${WRKDIR}/build
-PATCHDIR= ${.CURDIR}/../gcc-aux/files
+PATCHDIR= ${.CURDIR}/../${AUXPORT}/files
CFG_SCRIPT= ${WRKSRC}/configure
REVFILE= ${WRKSRC}/gcc/REVISION
SRPREFIX?= ${LOCALBASE}/android
@@ -89,6 +90,7 @@ ADA_CONFIG_ARGS+= ${ARG_FPU}
ADA_CONFIG_ARGS+= --enable-target-optspace
ADA_CONFIG_ARGS+= --enable-threads=posix
ADA_CONFIG_ARGS+= --enable-cxx-flags=-frtti
+ADA_CONFIG_ARGS+= --enable-checking=release
ADA_CONFIG_ARGS+= --disable-bootstrap
ADA_CONFIG_ARGS+= --disable-shared
ADA_CONFIG_ARGS+= --disable-libssp
@@ -148,12 +150,12 @@ post-stage:
acats: build
(cd ${BUILD_WRKSRC}/gcc && ${SETENV} \
- PATH=${LOCALBASE}/gcc-aux/bin:${PATH}:${PREFIX}/bin \
+ PATH=${LOCALBASE}/${AUXPORT}/bin:${PATH}:${PREFIX}/bin \
${GMAKE} -sk check-acats)
gnatdg: build
(cd ${BUILD_WRKSRC}/gcc && ${SETENV} \
- PATH=${LOCALBASE}/gcc-aux/bin:${PATH}:${PREFIX}/bin \
- ${GMAKE} -sk check-gnat RUNTESTFLAGS=--target_board=gnatdroid)
+ PATH=${LOCALBASE}/${AUXPORT}/bin:${PATH}:${PREFIX}/bin \
+ ${GMAKE} -sk check-gnat RUNTESTFLAGS=--target_board=gnatdroid6)
.include <bsd.port.mk>
Modified: head/lang/gnatdroid-armv7/pkg-descr
==============================================================================
--- head/lang/gnatdroid-armv7/pkg-descr Wed Mar 16 13:33:52 2016 (r411235)
+++ head/lang/gnatdroid-armv7/pkg-descr Wed Mar 16 14:36:10 2016 (r411236)
@@ -1,6 +1,6 @@
-The gnatdroid-armv7 port builds a C/Ada cross-compiler based on GCC 4.9
-that targets the Android operating system (up to version 5.0, API level
-21) running on ARM architecture (version 7). This produces binaries that
+The gnatdroid-armv7 port builds a C/Ada cross-compiler based on GCC 6
+that targets the Android operating system (up to version 6.0, API level
+23) running on ARM architecture (version 7). This produces binaries that
run natively on Android devices built with Cortex-A series chips.
WWW: http://www.dragonlace.net
Modified: head/lang/gnatdroid-armv7/pkg-plist
==============================================================================
--- head/lang/gnatdroid-armv7/pkg-plist Wed Mar 16 13:33:52 2016 (r411235)
+++ head/lang/gnatdroid-armv7/pkg-plist Wed Mar 16 14:36:10 2016 (r411236)
@@ -8,6 +8,7 @@ bin/%%TARGET%%-gcc
bin/%%TARGET%%-gcc-ar
bin/%%TARGET%%-gcc-nm
bin/%%TARGET%%-gcc-ranlib
+bin/%%TARGET%%-gcov-tool
%%FORT%%bin/%%TARGET%%-gfortran
bin/%%TARGET%%-gnat
bin/%%TARGET%%-gnatbind
Modified: head/lang/gnatdroid-sysroot-x86/Makefile
==============================================================================
--- head/lang/gnatdroid-sysroot-x86/Makefile Wed Mar 16 13:33:52 2016 (r411235)
+++ head/lang/gnatdroid-sysroot-x86/Makefile Wed Mar 16 14:36:10 2016 (r411236)
@@ -2,12 +2,13 @@
# $FreeBSD$
PORTNAME= sysroot
-PORTVERSION= 21
+PORTVERSION= 23
CATEGORIES= lang
-MASTER_SITES= http://downloads.dragonlace.net/src/
+MASTER_SITES= http://downloads.dragonlace.net/src/gnatdroid/
PKGNAMEPREFIX= gnatdroid-
PKGNAMESUFFIX= -x86
DISTNAME= android-${API}-x86
+DIST_SUBDIR= gnatdroid-ndk11
MAINTAINER= marino at FreeBSD.org
COMMENT= Android sysroots for C/Ada Android cross-compiler (x86)
@@ -23,11 +24,12 @@ STAT_PATCH= ${FILESDIR}/extra-stat.h
EXTRA_PATCHES= ${STAT_PATCH}
OPTIONS_SINGLE= SG1
-OPTIONS_SINGLE_SG1= KITKAT LOLLIPOP
+OPTIONS_SINGLE_SG1= KITKAT LOLLIPOP MARSH
OPTIONS_DEFAULT= KITKAT
KITKAT_DESC= Android 4.4 - API level 19 - Kitkat
LOLLIPOP_DESC= Android 5.0 - API level 21 - Lollipop
+MARSH_DESC= Android 6.0 - API Level 23 - Marshmellow
.include <bsd.port.options.mk>
@@ -36,6 +38,9 @@ API= 19
.elif ${PORT_OPTIONS:MLOLLIPOP}
API= 21
STAT_PATCH= ${FILESDIR}/extra-21-stat.h
+.elif ${PORT_OPTIONS:MMARSH}
+API= 23
+STAT_PATCH= ${FILESDIR}/extra-21-stat.h
.else
IGNORE= the API option is improperly selected
.endif
Modified: head/lang/gnatdroid-sysroot-x86/distinfo
==============================================================================
--- head/lang/gnatdroid-sysroot-x86/distinfo Wed Mar 16 13:33:52 2016 (r411235)
+++ head/lang/gnatdroid-sysroot-x86/distinfo Wed Mar 16 14:36:10 2016 (r411236)
@@ -1,4 +1,6 @@
-SHA256 (android-19-x86.tar.bz2) = 35c5e6fdebe54373d2103e500034d620fbda8a7b79148fc6a5e507a25ff17f24
-SIZE (android-19-x86.tar.bz2) = 5554684
-SHA256 (android-21-x86.tar.bz2) = 48c306569d4d27ba595c930bfe3ac69208868b2a1d2598b57e8f8ded293a7478
-SIZE (android-21-x86.tar.bz2) = 7261178
+SHA256 (gnatdroid-ndk11/android-19-x86.tar.bz2) = 35c5e6fdebe54373d2103e500034d620fbda8a7b79148fc6a5e507a25ff17f24
+SIZE (gnatdroid-ndk11/android-19-x86.tar.bz2) = 5554684
+SHA256 (gnatdroid-ndk11/android-21-x86.tar.bz2) = 48c306569d4d27ba595c930bfe3ac69208868b2a1d2598b57e8f8ded293a7478
+SIZE (gnatdroid-ndk11/android-21-x86.tar.bz2) = 7261178
+SHA256 (gnatdroid-ndk11/android-23-x86.tar.bz2) = 0bfdbff8bacd969fc15f69f2593a5c5cd64d3c4dda01ac98206564ee1fda1199
+SIZE (gnatdroid-ndk11/android-23-x86.tar.bz2) = 3938769
Modified: head/lang/gnatdroid-sysroot-x86/pkg-descr
==============================================================================
--- head/lang/gnatdroid-sysroot-x86/pkg-descr Wed Mar 16 13:33:52 2016 (r411235)
+++ head/lang/gnatdroid-sysroot-x86/pkg-descr Wed Mar 16 14:36:10 2016 (r411236)
@@ -1,5 +1,5 @@
This package is used by lang/gnatdroid to install the system root of
-Android 2.2 to 5.0 (API Level 8 to API Level 21) of the x86 architecture.
+Android 4.4 to 5.0 (API Level 19 to API Level 23) of the x86 architecture.
The x86 cross-tools are built using these files, which in turn is required
for the GNAT FreeBSD->Android(x86) cross-compiler that is gnatdroid.
Modified: head/lang/gnatdroid-sysroot/Makefile
==============================================================================
--- head/lang/gnatdroid-sysroot/Makefile Wed Mar 16 13:33:52 2016 (r411235)
+++ head/lang/gnatdroid-sysroot/Makefile Wed Mar 16 14:36:10 2016 (r411236)
@@ -2,11 +2,12 @@
# $FreeBSD$
PORTNAME= sysroot
-PORTVERSION= 21
+PORTVERSION= 23
CATEGORIES= lang
-MASTER_SITES= http://downloads.dragonlace.net/src/
+MASTER_SITES= http://downloads.dragonlace.net/src/gnatdroid/
PKGNAMEPREFIX= gnatdroid-
DISTNAME= android-${API}-arm
+DIST_SUBDIR= gnatdroid-ndk11
MAINTAINER= marino at FreeBSD.org
COMMENT= Android sysroots for C/Ada Android cross-compiler
@@ -23,26 +24,20 @@ STAT_PATCH= ${FILESDIR}/extra-stat.h
EXTRA_PATCHES= ${STAT_PATCH}
OPTIONS_SINGLE= SG1
-OPTIONS_SINGLE_SG1= FROYO GBREAD ICS JBEAN16 JBEAN17 JBEAN18 KITKAT \
- LOLLIPOP
+OPTIONS_SINGLE_SG1= ICS JBEAN16 JBEAN17 JBEAN18 KITKAT LOLLIPOP MARSH
OPTIONS_DEFAULT= KITKAT
-FROYO_DESC= Android 2.2 - API level 08 - Froyo
-GBREAD_DESC= Android 2.3 - API level 09 - Gingerbread 1
ICS_DESC= Android 4.0 - API level 15 - Ice Cream Sandwich 2
JBEAN16_DESC= Android 4.1 - API level 16 - Jelly Bean 1
JBEAN17_DESC= Android 4.2 - API level 17 - Jelly Bean 2
JBEAN18_DESC= Android 4.3 - API level 18 - Jelly Bean 3
KITKAT_DESC= Android 4.4 - API level 19 - Kitkat
LOLLIPOP_DESC= Android 5.0 - API level 21 - Lollipop
+MARSH_DESC= Android 6.0 - API Level 23 - Marshmellow
.include <bsd.port.options.mk>
-.if ${PORT_OPTIONS:MFROYO}
-API= 8
-.elif ${PORT_OPTIONS:MGBREAD}
-API= 9
-.elif ${PORT_OPTIONS:MICS}
+.if ${PORT_OPTIONS:MICS}
API= 15
.elif ${PORT_OPTIONS:MJBEAN16}
API= 16
@@ -55,6 +50,9 @@ API= 19
.elif ${PORT_OPTIONS:MLOLLIPOP}
API= 21
STAT_PATCH= ${FILESDIR}/extra-21-stat.h
+.elif ${PORT_OPTIONS:MMARSH}
+API= 23
+STAT_PATCH= ${FILESDIR}/extra-21-stat.h
.else
IGNORE= the API option is improperly selected
.endif
Modified: head/lang/gnatdroid-sysroot/distinfo
==============================================================================
--- head/lang/gnatdroid-sysroot/distinfo Wed Mar 16 13:33:52 2016 (r411235)
+++ head/lang/gnatdroid-sysroot/distinfo Wed Mar 16 14:36:10 2016 (r411236)
@@ -1,16 +1,14 @@
-SHA256 (android-8-arm.tar.bz2) = d352ecf413c7bf12561d3f5766e94be5e9da3232b3aa5a48c2186e41fdc0c549
-SIZE (android-8-arm.tar.bz2) = 1646555
-SHA256 (android-9-arm.tar.bz2) = 682cee5219f171a8bf4d0b35a33bc00d265a8c5a0b1d81ddd04389b402783190
-SIZE (android-9-arm.tar.bz2) = 1924233
-SHA256 (android-15-arm.tar.bz2) = 67836bdc1e5e2bd0db796e8e32f9faf5705f42b48b610fe479e0d92ff42280c2
-SIZE (android-15-arm.tar.bz2) = 1717174
-SHA256 (android-16-arm.tar.bz2) = a6966779c31663f60fddc2fab86287be74c06c376e8ffb3704e2b5c53a612dc9
-SIZE (android-16-arm.tar.bz2) = 1716973
-SHA256 (android-17-arm.tar.bz2) = 3ff8d76ba9f5f0aa129e7c69a5da2ec63696f553d5ad14d0859f51e7a38f992a
-SIZE (android-17-arm.tar.bz2) = 1716909
-SHA256 (android-18-arm.tar.bz2) = 73ceb5894c4436ca1477e0a535c3a014f334acf0683ab43bd22565f6c8ec6920
-SIZE (android-18-arm.tar.bz2) = 1736810
-SHA256 (android-19-arm.tar.bz2) = 734b37fa2c3aff05540ce9d8c73d0ad92623b281f0e267a05fd2f0c3a86e08ea
-SIZE (android-19-arm.tar.bz2) = 4621476
-SHA256 (android-21-arm.tar.bz2) = 7729bcd05fdc10b930d1f99920ed756681fe8cd6c2ecddb002a56e4badcfd2a3
-SIZE (android-21-arm.tar.bz2) = 5920624
+SHA256 (gnatdroid-ndk11/android-15-arm.tar.bz2) = 188711876e49285f6c06a54b12e4b1c1da21f059062ed6721453998c9b2bcd22
+SIZE (gnatdroid-ndk11/android-15-arm.tar.bz2) = 1724251
+SHA256 (gnatdroid-ndk11/android-16-arm.tar.bz2) = 3ecee83a807a474ff77943684caf14dcec8667608c03ed0e102ca05751a390f0
+SIZE (gnatdroid-ndk11/android-16-arm.tar.bz2) = 1723800
+SHA256 (gnatdroid-ndk11/android-17-arm.tar.bz2) = 88e7001a9489ae16098ad971188047bbceda9f5a7c8a5305433d3420c873df88
+SIZE (gnatdroid-ndk11/android-17-arm.tar.bz2) = 1724127
+SHA256 (gnatdroid-ndk11/android-18-arm.tar.bz2) = c91a5927e307ee5fdadcd38be2ecc599fa53e4a5eb4e7314ac0730b805143d0a
+SIZE (gnatdroid-ndk11/android-18-arm.tar.bz2) = 1736762
+SHA256 (gnatdroid-ndk11/android-19-arm.tar.bz2) = 51f94fc2a0de0c34f145cca1394ad0201ffd82aab93f9d3986b24120d739d408
+SIZE (gnatdroid-ndk11/android-19-arm.tar.bz2) = 4611404
+SHA256 (gnatdroid-ndk11/android-21-arm.tar.bz2) = 7729bcd05fdc10b930d1f99920ed756681fe8cd6c2ecddb002a56e4badcfd2a3
+SIZE (gnatdroid-ndk11/android-21-arm.tar.bz2) = 5920624
+SHA256 (gnatdroid-ndk11/android-23-arm.tar.bz2) = 64699a1193223bba3fce28130aa064937a237c8a695041cc4637b48e29cdd75e
+SIZE (gnatdroid-ndk11/android-23-arm.tar.bz2) = 3326272
Modified: head/lang/gnatdroid-sysroot/pkg-descr
==============================================================================
--- head/lang/gnatdroid-sysroot/pkg-descr Wed Mar 16 13:33:52 2016 (r411235)
+++ head/lang/gnatdroid-sysroot/pkg-descr Wed Mar 16 14:36:10 2016 (r411236)
@@ -1,5 +1,5 @@
This package is used by lang/gnatdroid to install the system root of
-Android 2.2 to 5.0 (API Level 8 to API Level 21) of the ARM architecture.
+Android 4.0 to 6.0 (API Level 15 to API Level 23) of the ARM architecture.
The ARM cross-tools are built using these files, which in turn is required
for the GNAT FreeBSD->ARM cross-compiler that is gnatdroid.
Modified: head/lang/gnatdroid-x86/pkg-descr
==============================================================================
--- head/lang/gnatdroid-x86/pkg-descr Wed Mar 16 13:33:52 2016 (r411235)
+++ head/lang/gnatdroid-x86/pkg-descr Wed Mar 16 14:36:10 2016 (r411236)
@@ -1,6 +1,6 @@
-The gnatdroid-x86 port builds a C/Ada cross-compiler based on GCC 4.9
-that targets the Android operating system (up to version 5.0, API level
-21) running on x86 or x86_64 architecture (version 7). This produces
-binaries that run natively on x86-based Android devices.
+The gnatdroid-x86 port builds a C/Ada cross-compiler based on GCC 6
+that targets the Android operating system (up to version 6.0, API level
+23) running on x86 or x86_64 architecture. This produces binaries that
+run natively on x86-based Android devices.
WWW: http://www.dragonlace.net
More information about the svn-ports-head
mailing list