Attachment #123383 for bug #166719

View | Details | Raw Unified | Return to bug 166719
Collapse All | Expand All




#

PORTNAME=	armv5
PORTVERSION=	${SNAPSHOT}
PORTREVISION=	1
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

MAINTAINER=	draco@marino.st
COMMENT=	C/Ada cross-compiler, target: Android ARMv5

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

.include "${.CURDIR}/../gnat-aux/Makefile.common"

LANGS=		c ada
APPLY_DIFFS=	core ada ada-testsuite gcc-testsuite
HAS_CONFIGURE=	YES
USE_ICONV=	YES
USE_BISON=	build
ALL_TARGET=	default
NO_MTREE=	YES

# Disable C++ until arm.cc/no-rtti issue resolved for libsupc++
#OPTIONS+=	CXX    "Also build C++ language" off

OPTIONS+=	FORT   "Also build Fortran language" off
OPTIONS+=	OBJC   "Also build Objective-C language" off

DROID_TARGET=		arm-android-eabi
DROID_ARCH=		armv5te
ARMVERSION=		ARMv5
FPU=			vfp
WRKSRC= 		${WRKDIR}/gcc-${GCC_VERSION}
GCC_VERSION=		4.6.1
WRKSRC=			${WRKDIR}/gcc-${GCC_BRANCH}-${PORTVERSION}
BUILDDIR=		${WRKDIR}/build
FILESDIR=		${.CURDIR}/../gnat-aux/files
CFG_SCRIPT=		${WRKSRC}/configure
REVFILE=		${WRKSRC}/gcc/REVISION
SRPREFIX=		${LOCALBASE}/android9
PREFIX= 		${SRPREFIX}/${ARMVERSION}
FULL_GNATGCC=		${LOCALBASE}/bin/gnatgcc
INSTALLDIRS=		lib/gcc libexec/gcc share
INSTALLDIRS+=		${DROID_TARGET}/lib/armv7-a
INSTALLDIRS+=		${DROID_TARGET}/lib/thumb
PLIST_SUB+=		TARGET="${DROID_TARGET}"
PLIST_SUB+=		GCCVERS="${GCC_VERSION}"

ADA_CONFIGURE_ENV=	CC=${FULL_GNATGCC}

.include <bsd.port.pre.mk>
.include <bsd.port.options.mk>

.if ${ARCH} == "amd64"
OS_LABEL4VERS=	"[FreeBSD64 x Android ${ARMVERSION}]"

OS_LABEL4VERS=	"[FreeBSD32 x Android ${ARMVERSION}]"
.endif

###########
##  C++  ##
###########

.if defined(WITH_CXX)
LANGS+= 	c++
APPLY_DIFFS+=	cxx cxx-testsuite
DISTFILES+=	gcc-g++-${GCC_VERSION}.tar.bz2
INSTALLDIRS+=	include/c++/${GCC_VERSION}
PLIST_SUB+=	CXX=""
.else
PLIST_SUB+=	CXX="@comment "
.endif

###############
##  Fortran  ##
###############

.if defined(WITH_FORT)
LANGS+= 	fortran
APPLY_DIFFS+=	fortran
DISTFILES+=	gcc-fortran-${GCC_VERSION}.tar.bz2
PLIST_SUB+=	FRT=""
.else
PLIST_SUB+=	FRT="@comment "
.endif

###################
##  Objective-C  ##
###################

.if defined(WITH_OBJC)
LANGS+= 	objc
DISTFILES+=	gcc-objc-${GCC_VERSION}.tar.bz2
.endif

CONFIGURE_ARGS= 	--enable-languages=${LANGS:Q}
CONFIGURE_ARGS+=	--target=${DROID_TARGET}
CONFIGURE_ARGS+=	--program-prefix=${DROID_TARGET}-
CONFIGURE_ARGS+=	--prefix=${PREFIX}

CONFIGURE_ARGS+=	--disable-libgomp
CONFIGURE_ARGS+=	--disable-libmudflap
CONFIGURE_ARGS+=	--disable-libquadmath
CONFIGURE_ARGS+=	--disable-sjlj-exceptions
CONFIGURE_ARGS+=	--disable-tls
CONFIGURE_ARGS+=	--disable-nls


	# Personalize GNAT for each different machine
	@${ECHO} "-=> GNAT AUX ${OS_LABEL4VERS}" > ${REVFILE}

	# Create new directories in preparation of applying diff files
.if defined(WITH_CXX)
	${MKDIR} ${WRKSRC}/libstdc++-v3/config/locale/dragonfly
	${MKDIR} ${WRKSRC}/libstdc++-v3/config/os/bsd/dragonfly
.endif

	# Apply required composite diff files
.for suffix in ${APPLY_DIFFS}
	@${ECHO} "Applying composite patch diff-${suffix}"
	@${PATCH} -d ${WRKSRC} -s -E < ${FILESDIR}/diff-${suffix}
.endfor

do-configure:
	${MKDIR} ${BUILDDIR}
	cd ${BUILDDIR} && ${SETENV} ${ADA_CONFIGURE_ENV} \

	   ${PREFIX}/bin/${DROID_TARGET}-gnatgcc
	${MV} ${PREFIX}/${DROID_TARGET}/bin/gcc \
	   ${PREFIX}/${DROID_TARGET}/bin/gnatgcc
.if defined(WITH_FORT)
	${MV} ${PREFIX}/bin/${DROID_TARGET}-gfortran \
	   ${PREFIX}/bin/${DROID_TARGET}-gnatgfortran
	${MV} ${PREFIX}/${DROID_TARGET}/bin/gfortran \
	   ${PREFIX}/${DROID_TARGET}/bin/gnatgfortran
.endif

post-install:
.for d in ${INSTALLDIRS}
	cd ${PREFIX}; ${FIND} $d \( -type f -or -type l \) | ${SORT} >> ${TMPPLIST}
	cd ${PREFIX}; ${FIND} $d -type d | ${SORT} -dr | \
	   ${SED} -e 's/^/@dirrm /g' >> ${TMPPLIST}




SHA256 (gcc-core-4.6.3.tar.bz2) = 283e00881c0de258fafc5170843e4d9b14ee2a7dc4426f0d426e6be0400251c1
SIZE (gcc-core-4.6.3.tar.bz2) = 30305971
SHA256 (gcc-ada-4.6.3.tar.bz2) = 7bb213ec3948646df72720580fcba3489c84aa452bd0e4238712607ef83cbdf6
SIZE (gcc-ada-4.6.3.tar.bz2) = 6092418
SHA256 (gcc-g++-4.6.3.tar.bz2) = b3e0c733e900e99096b0c5480f57e22e3e583ec3d83596cc2cb9986bd64b29e8
SIZE (gcc-g++-4.6.3.tar.bz2) = 6928430
SHA256 (gcc-fortran-4.6.3.tar.bz2) = fe1bdf3485f33e6d0a998ff7bcb42526fbf3083dbfc107c3d95a88c00739eadb
SIZE (gcc-fortran-4.6.3.tar.bz2) = 1676490
SHA256 (gcc-objc-4.6.3.tar.bz2) = 4c193397ce0b8b7b3a6b090078f7228e22999edb14a53480ac709f7f165a4ca3
SIZE (gcc-objc-4.6.3.tar.bz2) = 342441
SHA256 (gcc-testsuite-4.6.3.tar.bz2) = a3448d09e5e8ce6baee4080981efc85e6af1621b66a68258dd645c04ae381bed
SIZE (gcc-testsuite-4.6.3.tar.bz2) = 6354781




bin/%%TARGET%%-cpp
bin/%%TARGET%%-gnatgcc
bin/%%TARGET%%-gcc-%%GCCVERS%%
%%FRT%%bin/%%TARGET%%-gnatgfortran
lib/libiberty.a
%%TARGET%%/bin/gnatbind
%%TARGET%%/bin/gnatchop

%%TARGET%%/bin/gnatmake
%%TARGET%%/bin/gnatprep
%%TARGET%%/bin/gnatgcc
%%FRT%%%%TARGET%%/bin/gnatgfortran
%%FRT%%%%TARGET%%/lib/libgfortran.a
%%FRT%%%%TARGET%%/lib/libgfortran.la
%%FRT%%%%TARGET%%/lib/libgfortran.spec
@dirrm %%TARGET%%/lib/armv7-a/thumb
@dirrm %%TARGET%%/lib/armv7-a
@dirrm %%TARGET%%/lib/thumb

Removed Link Here

(-)files/patch-configure (-11 lines)
1	--- configure.orig 2011-07-18 00:12:43.000000000 +0200
2	+++ configure 2011-07-18 00:13:35.000000000 +0200
3	@@ -3233,7 +3233,7 @@
4	libgloss_dir=arm
5	;;
6	arm--elf \| strongarm--elf \| xscale--elf \| arm--eabi* )
7	- noconfigdirs="$noconfigdirs target-libffi target-qthreads"
8	+ noconfigdirs="$noconfigdirs target-libffi target-qthreads target-libstdc++-v3"
9	libgloss_dir=arm
10	;;
11	arm--linux-gnueabi)




--- gcc/Makefile.in.orig	2011-01-09 00:44:20.000000000 +0100
+++ gcc/Makefile.in	2011-01-09 00:53:28.000000000 +0100
@@ -306,11 +306,11 @@
 # This is where we get zlib from.  zlibdir is -L../zlib and zlibinc is
 # -I../zlib, unless we were configured with --with-system-zlib, in which
 # case both are empty.
-ZLIB = @zlibdir@ -lz
+ZLIB = -Wl,-Bstatic @zlibdir@ -lz -Wl,-Bdynamic
 ZLIBINC = @zlibinc@
 
 # How to find GMP
-GMPLIBS = @GMPLIBS@
+GMPLIBS = -Wl,-Bstatic @GMPLIBS@ -Wl,-Bdynamic
 GMPINC = @GMPINC@
 
 # How to find PPL
@@ -626,8 +626,8 @@
 LIBINTL_DEP = @LIBINTL_DEP@
 
 # Character encoding conversion library.
-LIBICONV = @LIBICONV@
-LIBICONV_DEP = @LIBICONV_DEP@
+LIBICONV = -Wl,-Bstatic -L/usr/local/lib -liconv -Wl,-Bdynamic
+LIBICONV_DEP =
 
 # The GC method to be used on this system.
 GGC=@GGC@.o




--- gcc/ada/adaint.c.orig	2011-04-16 05:34:37.000000000 -0500
+++ gcc/ada/adaint.c	2011-08-19 23:28:10.000000000 -0500
@@ -1201,6 +1201,47 @@
     free (pname);
   }
 
+#elif defined (__ANDROID__)
+
+  /* 
+   * ext2 /ext3/ext4/fat16/fat32 have no path limits 
+   * /data/local/tmp normally requires rooted devices, if it even exists
+   * /sdcard is the standard location for external storage.  Nativeactivity
+   * manifest needs to authorize its use, otherwise it might not have the
+   * proper permissions.
+   */
+
+  int testfd;
+  char *datadir = getenv ("ANDROID_DATA");
+
+  if (datadir == NULL)
+    strcpy (tmp_filename, "/data/local/tmp/gnat-XXXXXX");
+  else 
+    sprintf (tmp_filename, "%s/local/tmp/gnat-XXXXXX", datadir);
+
+  testfd = mkstemp (tmp_filename);  
+  if (testfd != -1)
+    {
+      close (testfd);
+      return;
+    }
+
+  char *sdcard = getenv ("EXTERNAL_STORAGE");
+
+  if (sdcard == NULL)
+    strcpy (tmp_filename, "/sdcard/gnat-XXXXXX");      
+  else
+    sprintf (tmp_filename, "%s/gnat-XXXXXX", sdcard);
+    
+  testfd = mkstemp (tmp_filename);  
+  if (testfd != -1)
+    {
+      close (testfd);
+      return;
+    }
+       
+  tmpnam (tmp_filename);
+
 #elif defined (linux) || defined (__FreeBSD__) || defined (__NetBSD__) \
   || defined (__DragonFly__) \
   || defined (__OpenBSD__) || defined(__GLIBC__)




--- gcc/ada/gcc-interface/Makefile.in.orig	2011-09-07 16:11:58.000000000 -0500
+++ gcc/ada/gcc-interface/Makefile.in	2011-09-07 16:16:29.000000000 -0500
@@ -1184,6 +1184,8 @@
   a-numaux.ads<a-numaux-x86.ads \
   g-bytswa.adb<g-bytswa-x86.adb \
   g-socthi.adb<g-socthi-bsd.adb \
+  g-trasym.ads<g-trasym-unimplemented.ads \
+  g-trasym.adb<g-trasym-unimplemented.adb \
   s-inmaop.adb<s-inmaop-posix.adb \
   s-intman.adb<s-intman-posix.adb \
   s-osinte.adb<s-osinte-freebsd.adb \
@@ -1219,6 +1221,8 @@
   a-numaux.ads<a-numaux-x86.ads \
   g-bytswa.adb<g-bytswa-x86.adb \
   g-socthi.adb<g-socthi-bsd.adb \
+  g-trasym.ads<g-trasym-unimplemented.ads \
+  g-trasym.adb<g-trasym-unimplemented.adb \
   s-inmaop.adb<s-inmaop-posix.adb \
   s-intman.adb<s-intman-posix.adb \
   s-osinte.adb<s-osinte-freebsd.adb \
@@ -1253,6 +1257,8 @@
   a-numaux.ads<a-numaux-x86.ads \
   g-bytswa.adb<g-bytswa-x86.adb \
   g-socthi.adb<g-socthi-bsd.adb \
+  g-trasym.ads<g-trasym-unimplemented.ads \
+  g-trasym.adb<g-trasym-unimplemented.adb \
   s-inmaop.adb<s-inmaop-posix.adb \
   s-intman.adb<s-intman-posix.adb \
   s-osinte.adb<s-osinte-dragonfly.adb \
@@ -1288,6 +1294,8 @@
   a-numaux.ads<a-numaux-x86.ads \
   g-bytswa.adb<g-bytswa-x86.adb \
   g-socthi.adb<g-socthi-bsd.adb \
+  g-trasym.ads<g-trasym-unimplemented.ads \
+  g-trasym.adb<g-trasym-unimplemented.adb \
   s-inmaop.adb<s-inmaop-posix.adb \
   s-intman.adb<s-intman-posix.adb \
   s-osinte.adb<s-osinte-dragonfly.adb \
@@ -1322,6 +1330,8 @@
   a-numaux.ads<a-numaux-x86.ads \
   g-bytswa.adb<g-bytswa-x86.adb \
   g-socthi.adb<g-socthi-bsd.adb \
+  g-trasym.ads<g-trasym-unimplemented.ads \
+  g-trasym.adb<g-trasym-unimplemented.adb \
   s-inmaop.adb<s-inmaop-posix.adb \
   s-intman.adb<s-intman-posix.adb \
   s-osinte.adb<s-osinte-openbsd.adb \
@@ -1357,6 +1367,8 @@
   a-numaux.ads<a-numaux-x86.ads \
   g-bytswa.adb<g-bytswa-x86.adb \
   g-socthi.adb<g-socthi-bsd.adb \
+  g-trasym.ads<g-trasym-unimplemented.ads \
+  g-trasym.adb<g-trasym-unimplemented.adb \
   s-inmaop.adb<s-inmaop-posix.adb \
   s-intman.adb<s-intman-posix.adb \
   s-osinte.adb<s-osinte-openbsd.adb \
@@ -1391,6 +1403,8 @@
   a-numaux.ads<a-numaux-x86.ads \
   g-bytswa.adb<g-bytswa-x86.adb \
   g-socthi.adb<g-socthi-netbsd.adb \
+  g-trasym.ads<g-trasym-unimplemented.ads \
+  g-trasym.adb<g-trasym-unimplemented.adb \
   s-inmaop.adb<s-inmaop-posix.adb \
   s-intman.adb<s-intman-posix.adb \
   s-osinte.adb<s-osinte-netbsd.adb \
@@ -1435,6 +1449,8 @@
   a-numaux.ads<a-numaux-x86.ads \
   g-bytswa.adb<g-bytswa-x86.adb \
   g-socthi.adb<g-socthi-netbsd.adb \
+  g-trasym.ads<g-trasym-unimplemented.ads \
+  g-trasym.adb<g-trasym-unimplemented.adb \
   s-inmaop.adb<s-inmaop-posix.adb \
   s-intman.adb<s-intman-posix.adb \
   s-osinte.adb<s-osinte-netbsd.adb \
@@ -1472,6 +1488,8 @@
 ifeq ($(strip $(filter-out arm% android eabi,$(targ))),)
   LIBGNAT_TARGET_PAIRS = \
   a-intnam.ads<a-intnam-linux.ads \
+  g-trasym.ads<g-trasym-unimplemented.ads \
+  g-trasym.adb<g-trasym-unimplemented.adb \
   s-inmaop.adb<s-inmaop-posix.adb \
   s-intman.adb<s-intman-posix.adb \
   s-linux.ads<s-linux.ads \

Removed Link Here

(-)files/patch-libiberty__getpagesize.c (-15 lines)
1	--- libiberty/getpagesize.c.orig 2011-01-29 06:55:10 +0100
2	+++ libiberty/getpagesize.c 2011-01-29 07:07:40 +0100
3	@@ -20,6 +20,7 @@
4
5	*/
6
7	+#ifndef __ANDROID__
8	#ifndef VMS
9
10	#include "config.h"
11	@@ -88,3 +89,4 @@
12	}
13
14	#endif /* VMS */
15	+#endif /* __ANDROID__ */




--- libiberty/setproctitle.c.orig	2011-01-29 07:11:03 +0100
+++ libiberty/setproctitle.c	2011-01-29 07:28:55 +0100
@@ -40,9 +40,11 @@
 void
 setproctitle (const char *name ATTRIBUTE_UNUSED, ...)
 {
+#ifndef __ANDROID__
 #ifdef PR_SET_NAME
   /* On Linux this sets the top visible "comm", but not necessarily
      the name visible in ps. */
   prctl (PR_SET_NAME, name);
 #endif
+#endif
 }

Return to bug 166719

Lines 6-58 Link Here

(-)Makefile (-24 / +84 lines)
6	#	6	#
7		7
8	PORTNAME= armv5	8	PORTNAME= armv5
9	PORTVERSION= 20110627	9	PORTVERSION= ${SNAPSHOT}
10	PORTREVISION= 1
11	CATEGORIES= lang	10	CATEGORIES= lang
12	MASTER_SITES= http://downloads.dragonlace.net/src/ \	11	MASTER_SITES= ${MASTER_SITE_GCC}
13	http://dragonlace.mirrors.ada.cx/src/	12	MASTER_SITE_SUBDIR= releases/gcc-${GCC_VERSION}
14	PKGNAMEPREFIX= gnatdroid-	13	PKGNAMEPREFIX= gnatdroid-
15	DISTNAME= arm-gnat-${PORTVERSION}	14	DISTNAME= arm-gnat-${PORTVERSION}
		15	DISTFILES= gcc-core-${GCC_VERSION}.tar.bz2 \
		16	gcc-ada-${GCC_VERSION}.tar.bz2 \
		17	gcc-testsuite-${GCC_VERSION}.tar.bz2
16		18
17	MAINTAINER= draco@marino.st	19	MAINTAINER= draco@marino.st
18	COMMENT= C/Ada cross-compiler, target: Android ARMv5	20	COMMENT= C/Ada cross-compiler, target: Android ARMv5
19		21
20	BUILD_DEPENDS= gnatdroid-sysroot>=9:${PORTSDIR}/lang/gnatdroid-sysroot \	22	BUILD_DEPENDS= gnatdroid-sysroot>=9:${PORTSDIR}/lang/gnatdroid-sysroot \
21	gnatdroid-binutils>=2.21:${PORTSDIR}/lang/gnatdroid-binutils \	23	gnatdroid-binutils>=2.21:${PORTSDIR}/lang/gnatdroid-binutils \
22	${LOCALBASE}/lib/libgmp.so:${PORTSDIR}/math/gmp \	24	gnat-aux>=20110325:${PORTSDIR}/lang/gnat-aux
23	${LOCALBASE}/lib/libmpfr.so:${PORTSDIR}/math/mpfr \	25	RUN_DEPENDS:= gnatdroid-sysroot>=9:${PORTSDIR}/lang/gnatdroid-sysroot \
24	${LOCALBASE}/lib/libmpc.so:${PORTSDIR}/math/mpc	26	gnatdroid-binutils>=2.21:${PORTSDIR}/lang/gnatdroid-binutils
25	RUN_DEPENDS:= ${BUILD_DEPENDS}	27
26	BUILD_DEPENDS+= gnat-aux>=20110325:${PORTSDIR}/lang/gnat-aux	28	.include "${.CURDIR}/../gnat-aux/Makefile.common"
27		29
28	USE_BZIP2= YES	30	LANGS= c ada
29	USE_GMAKE= YES	31	APPLY_DIFFS= core ada ada-testsuite gcc-testsuite
30	HAS_CONFIGURE= YES
31	USE_ICONV= YES
32	USE_BISON= build
33	ALL_TARGET= default
34	NO_MTREE= YES	32	NO_MTREE= YES
35	MAKE_JOBS_SAFE= YES	33
		34	# Disable C++ until arm.cc/no-rtti issue resolved for libsupc++
		35	#OPTIONS+= CXX "Also build C++ language" off
		36
		37	OPTIONS+= FORT "Also build Fortran language" off
		38	OPTIONS+= OBJC "Also build Objective-C language" off
36		39
37	DROID_TARGET= arm-android-eabi	40	DROID_TARGET= arm-android-eabi
38	DROID_ARCH= armv5te	41	DROID_ARCH= armv5te
39	ARMVERSION= ARMv5	42	ARMVERSION= ARMv5
40	FPU= vfp	43	FPU= vfp
41	GCC_BRANCH= 4.6	44	WRKSRC= ${WRKDIR}/gcc-${GCC_VERSION}
42	GCC_VERSION= 4.6.1
43	WRKSRC= ${WRKDIR}/gcc-${GCC_BRANCH}-${PORTVERSION}
44	BUILDDIR= ${WRKDIR}/build	45	BUILDDIR= ${WRKDIR}/build
		46	FILESDIR= ${.CURDIR}/../gnat-aux/files
45	CFG_SCRIPT= ${WRKSRC}/configure	47	CFG_SCRIPT= ${WRKSRC}/configure
46	REVFILE= ${WRKSRC}/gcc/REVISION	48	REVFILE= ${WRKSRC}/gcc/REVISION
47	SRPREFIX= ${LOCALBASE}/android9	49	SRPREFIX= ${LOCALBASE}/android9
48	PREFIX= ${SRPREFIX}/${ARMVERSION}	50	PREFIX= ${SRPREFIX}/${ARMVERSION}
49	FULL_GNATGCC= ${LOCALBASE}/bin/gnatgcc	51	FULL_GNATGCC= ${LOCALBASE}/bin/gnatgcc
		52	INSTALLDIRS= lib/gcc libexec/gcc share
		53	INSTALLDIRS+= ${DROID_TARGET}/lib/armv7-a
		54	INSTALLDIRS+= ${DROID_TARGET}/lib/thumb
50	PLIST_SUB+= TARGET="${DROID_TARGET}"	55	PLIST_SUB+= TARGET="${DROID_TARGET}"
51	PLIST_SUB+= GCCVERS="${GCC_VERSION}"	56	PLIST_SUB+= GCCVERS="${GCC_VERSION}"
52		57
53	ADA_CONFIGURE_ENV= CC=${FULL_GNATGCC}	58	ADA_CONFIGURE_ENV= CC=${FULL_GNATGCC}
54		59
55	.include <bsd.port.pre.mk>	60	.include <bsd.port.pre.mk>
		61	.include <bsd.port.options.mk>
56		62
57	.if ${ARCH} == "amd64"	63	.if ${ARCH} == "amd64"
58	OS_LABEL4VERS= "[FreeBSD64 x Android ${ARMVERSION}]"	64	OS_LABEL4VERS= "[FreeBSD64 x Android ${ARMVERSION}]"
Lines 60-66 Link Here
60	OS_LABEL4VERS= "[FreeBSD32 x Android ${ARMVERSION}]"	66	OS_LABEL4VERS= "[FreeBSD32 x Android ${ARMVERSION}]"
61	.endif	67	.endif
62		68
63	CONFIGURE_ARGS= --enable-languages=c,ada	69	###########
		70	## C++ ##
		71	###########
		72
		73	.if defined(WITH_CXX)
		74	LANGS+= c++
		75	APPLY_DIFFS+= cxx cxx-testsuite
		76	DISTFILES+= gcc-g++-${GCC_VERSION}.tar.bz2
		77	INSTALLDIRS+= include/c++/${GCC_VERSION}
		78	PLIST_SUB+= CXX=""
		79	.else
		80	PLIST_SUB+= CXX="@comment "
		81	.endif
		82
		83	###############
		84	## Fortran ##
		85	###############
		86
		87	.if defined(WITH_FORT)
		88	LANGS+= fortran
		89	APPLY_DIFFS+= fortran
		90	DISTFILES+= gcc-fortran-${GCC_VERSION}.tar.bz2
		91	PLIST_SUB+= FRT=""
		92	.else
		93	PLIST_SUB+= FRT="@comment "
		94	.endif
		95
		96	###################
		97	## Objective-C ##
		98	###################
		99
		100	.if defined(WITH_OBJC)
		101	LANGS+= objc
		102	DISTFILES+= gcc-objc-${GCC_VERSION}.tar.bz2
		103	.endif
		104
		105	CONFIGURE_ARGS= --enable-languages=${LANGS:Q}
64	CONFIGURE_ARGS+= --target=${DROID_TARGET}	106	CONFIGURE_ARGS+= --target=${DROID_TARGET}
65	CONFIGURE_ARGS+= --program-prefix=${DROID_TARGET}-	107	CONFIGURE_ARGS+= --program-prefix=${DROID_TARGET}-
66	CONFIGURE_ARGS+= --prefix=${PREFIX}	108	CONFIGURE_ARGS+= --prefix=${PREFIX}
Lines 81-87 Link Here
81	CONFIGURE_ARGS+= --disable-libgomp	123	CONFIGURE_ARGS+= --disable-libgomp
82	CONFIGURE_ARGS+= --disable-libmudflap	124	CONFIGURE_ARGS+= --disable-libmudflap
83	CONFIGURE_ARGS+= --disable-libquadmath	125	CONFIGURE_ARGS+= --disable-libquadmath
84	CONFIGURE_ARGS+= --disable-libstdcxx-pch	126	CONFIGURE_ARGS+= --disable-sjlj-exceptions
85	CONFIGURE_ARGS+= --disable-tls	127	CONFIGURE_ARGS+= --disable-tls
86	CONFIGURE_ARGS+= --disable-nls	128	CONFIGURE_ARGS+= --disable-nls
87		129
Lines 89-94 Link Here
89	# Personalize GNAT for each different machine	131	# Personalize GNAT for each different machine
90	@${ECHO} "-=> GNAT AUX ${OS_LABEL4VERS}" > ${REVFILE}	132	@${ECHO} "-=> GNAT AUX ${OS_LABEL4VERS}" > ${REVFILE}
91		133
		134	# Create new directories in preparation of applying diff files
		135	.if defined(WITH_CXX)
		136	${MKDIR} ${WRKSRC}/libstdc++-v3/config/locale/dragonfly
		137	${MKDIR} ${WRKSRC}/libstdc++-v3/config/os/bsd/dragonfly
		138	.endif
		139
		140	# Apply required composite diff files
		141	.for suffix in ${APPLY_DIFFS}
		142	@${ECHO} "Applying composite patch diff-${suffix}"
		143	@${PATCH} -d ${WRKSRC} -s -E < ${FILESDIR}/diff-${suffix}
		144	.endfor
		145
92	do-configure:	146	do-configure:
93	${MKDIR} ${BUILDDIR}	147	${MKDIR} ${BUILDDIR}
94	cd ${BUILDDIR} && ${SETENV} ${ADA_CONFIGURE_ENV} \	148	cd ${BUILDDIR} && ${SETENV} ${ADA_CONFIGURE_ENV} \
Lines 103-111 Link Here
103	${PREFIX}/bin/${DROID_TARGET}-gnatgcc	157	${PREFIX}/bin/${DROID_TARGET}-gnatgcc
104	${MV} ${PREFIX}/${DROID_TARGET}/bin/gcc \	158	${MV} ${PREFIX}/${DROID_TARGET}/bin/gcc \
105	${PREFIX}/${DROID_TARGET}/bin/gnatgcc	159	${PREFIX}/${DROID_TARGET}/bin/gnatgcc
		160	.if defined(WITH_FORT)
		161	${MV} ${PREFIX}/bin/${DROID_TARGET}-gfortran \
		162	${PREFIX}/bin/${DROID_TARGET}-gnatgfortran
		163	${MV} ${PREFIX}/${DROID_TARGET}/bin/gfortran \
		164	${PREFIX}/${DROID_TARGET}/bin/gnatgfortran
		165	.endif
106		166
107	post-install:	167	post-install:
108	.for d in lib/gcc libexec/gcc share	168	.for d in ${INSTALLDIRS}
109	cd ${PREFIX}; ${FIND} $d \( -type f -or -type l \) \| ${SORT} >> ${TMPPLIST}	169	cd ${PREFIX}; ${FIND} $d \( -type f -or -type l \) \| ${SORT} >> ${TMPPLIST}
110	cd ${PREFIX}; ${FIND} $d -type d \| ${SORT} -dr \| \	170	cd ${PREFIX}; ${FIND} $d -type d \| ${SORT} -dr \| \
111	${SED} -e 's/^/@dirrm /g' >> ${TMPPLIST}	171	${SED} -e 's/^/@dirrm /g' >> ${TMPPLIST}

Lines 1-2 Link Here

(-)distinfo (-2 / +12 lines)
1	SHA256 (arm-gnat-20110627.tar.bz2) = 3698806aabc63ab93a23e57c2fc4065f41f788e2ac9cff4a05ae501723e7499f	1	SHA256 (gcc-core-4.6.3.tar.bz2) = 283e00881c0de258fafc5170843e4d9b14ee2a7dc4426f0d426e6be0400251c1
2	SIZE (arm-gnat-20110627.tar.bz2) = 19133878	2	SIZE (gcc-core-4.6.3.tar.bz2) = 30305971
		3	SHA256 (gcc-ada-4.6.3.tar.bz2) = 7bb213ec3948646df72720580fcba3489c84aa452bd0e4238712607ef83cbdf6
		4	SIZE (gcc-ada-4.6.3.tar.bz2) = 6092418
		5	SHA256 (gcc-g++-4.6.3.tar.bz2) = b3e0c733e900e99096b0c5480f57e22e3e583ec3d83596cc2cb9986bd64b29e8
		6	SIZE (gcc-g++-4.6.3.tar.bz2) = 6928430
		7	SHA256 (gcc-fortran-4.6.3.tar.bz2) = fe1bdf3485f33e6d0a998ff7bcb42526fbf3083dbfc107c3d95a88c00739eadb
		8	SIZE (gcc-fortran-4.6.3.tar.bz2) = 1676490
		9	SHA256 (gcc-objc-4.6.3.tar.bz2) = 4c193397ce0b8b7b3a6b090078f7228e22999edb14a53480ac709f7f165a4ca3
		10	SIZE (gcc-objc-4.6.3.tar.bz2) = 342441
		11	SHA256 (gcc-testsuite-4.6.3.tar.bz2) = a3448d09e5e8ce6baee4080981efc85e6af1621b66a68258dd645c04ae381bed
		12	SIZE (gcc-testsuite-4.6.3.tar.bz2) = 6354781

Lines 14-19 Link Here

(-)pkg-plist (-7 / +5 lines)
14	bin/%%TARGET%%-cpp	14	bin/%%TARGET%%-cpp
15	bin/%%TARGET%%-gnatgcc	15	bin/%%TARGET%%-gnatgcc
16	bin/%%TARGET%%-gcc-%%GCCVERS%%	16	bin/%%TARGET%%-gcc-%%GCCVERS%%
		17	%%FRT%%bin/%%TARGET%%-gnatgfortran
17	lib/libiberty.a	18	lib/libiberty.a
18	%%TARGET%%/bin/gnatbind	19	%%TARGET%%/bin/gnatbind
19	%%TARGET%%/bin/gnatchop	20	%%TARGET%%/bin/gnatchop
Lines 24-33 Link Here
24	%%TARGET%%/bin/gnatmake	25	%%TARGET%%/bin/gnatmake
25	%%TARGET%%/bin/gnatprep	26	%%TARGET%%/bin/gnatprep
26	%%TARGET%%/bin/gnatgcc	27	%%TARGET%%/bin/gnatgcc
27	%%TARGET%%/lib/armv7-a/thumb/libiberty.a	28	%%FRT%%%%TARGET%%/bin/gnatgfortran
28	%%TARGET%%/lib/armv7-a/libiberty.a	29	%%FRT%%%%TARGET%%/lib/libgfortran.a
29	%%TARGET%%/lib/thumb/libiberty.a	30	%%FRT%%%%TARGET%%/lib/libgfortran.la
30	%%TARGET%%/lib/libiberty.a	31	%%FRT%%%%TARGET%%/lib/libgfortran.spec
31	@dirrm %%TARGET%%/lib/armv7-a/thumb
32	@dirrm %%TARGET%%/lib/armv7-a
33	@dirrm %%TARGET%%/lib/thumb

Removed Link Here

(-)files/patch-gcc__Makefile.in (-27 lines)
1	--- gcc/Makefile.in.orig 2011-01-09 00:44:20.000000000 +0100
2	+++ gcc/Makefile.in 2011-01-09 00:53:28.000000000 +0100
3	@@ -306,11 +306,11 @@
4	# This is where we get zlib from. zlibdir is -L../zlib and zlibinc is
5	# -I../zlib, unless we were configured with --with-system-zlib, in which
6	# case both are empty.
7	-ZLIB = @zlibdir@ -lz
8	+ZLIB = -Wl,-Bstatic @zlibdir@ -lz -Wl,-Bdynamic
9	ZLIBINC = @zlibinc@
10
11	# How to find GMP
12	-GMPLIBS = @GMPLIBS@
13	+GMPLIBS = -Wl,-Bstatic @GMPLIBS@ -Wl,-Bdynamic
14	GMPINC = @GMPINC@
15
16	# How to find PPL
17	@@ -626,8 +626,8 @@
18	LIBINTL_DEP = @LIBINTL_DEP@
19
20	# Character encoding conversion library.
21	-LIBICONV = @LIBICONV@
22	-LIBICONV_DEP = @LIBICONV_DEP@
23	+LIBICONV = -Wl,-Bstatic -L/usr/local/lib -liconv -Wl,-Bdynamic
24	+LIBICONV_DEP =
25
26	# The GC method to be used on this system.
27	GGC=@GGC@.o

Removed Link Here

(-)files/patch-gcc__ada__adaint.c (-50 lines)
1	--- gcc/ada/adaint.c.orig 2011-04-16 05:34:37.000000000 -0500
2	+++ gcc/ada/adaint.c 2011-08-19 23:28:10.000000000 -0500
3	@@ -1201,6 +1201,47 @@
4	free (pname);
5	}
6
7	+#elif defined (__ANDROID__)
8	+
9	+ /*
10	+ * ext2 /ext3/ext4/fat16/fat32 have no path limits
11	+ * /data/local/tmp normally requires rooted devices, if it even exists
12	+ * /sdcard is the standard location for external storage. Nativeactivity
13	+ * manifest needs to authorize its use, otherwise it might not have the
14	+ * proper permissions.
15	+ */
16	+
17	+ int testfd;
18	+ char *datadir = getenv ("ANDROID_DATA");
19	+
20	+ if (datadir == NULL)
21	+ strcpy (tmp_filename, "/data/local/tmp/gnat-XXXXXX");
22	+ else
23	+ sprintf (tmp_filename, "%s/local/tmp/gnat-XXXXXX", datadir);
24	+
25	+ testfd = mkstemp (tmp_filename);
26	+ if (testfd != -1)
27	+ {
28	+ close (testfd);
29	+ return;
30	+ }
31	+
32	+ char *sdcard = getenv ("EXTERNAL_STORAGE");
33	+
34	+ if (sdcard == NULL)
35	+ strcpy (tmp_filename, "/sdcard/gnat-XXXXXX");
36	+ else
37	+ sprintf (tmp_filename, "%s/gnat-XXXXXX", sdcard);
38	+
39	+ testfd = mkstemp (tmp_filename);
40	+ if (testfd != -1)
41	+ {
42	+ close (testfd);
43	+ return;
44	+ }
45	+
46	+ tmpnam (tmp_filename);
47	+
48	#elif defined (linux) \|\| defined (__FreeBSD__) \|\| defined (__NetBSD__) \
49	\|\| defined (__DragonFly__) \
50	\|\| defined (__OpenBSD__) \|\| defined(__GLIBC__)

Removed Link Here

(-)files/patch-gcc__ada__gccint__Makefile.in (-83 lines)
1	--- gcc/ada/gcc-interface/Makefile.in.orig 2011-09-07 16:11:58.000000000 -0500
2	+++ gcc/ada/gcc-interface/Makefile.in 2011-09-07 16:16:29.000000000 -0500
3	@@ -1184,6 +1184,8 @@
4	a-numaux.ads<a-numaux-x86.ads \
5	g-bytswa.adb<g-bytswa-x86.adb \
6	g-socthi.adb<g-socthi-bsd.adb \
7	+ g-trasym.ads<g-trasym-unimplemented.ads \
8	+ g-trasym.adb<g-trasym-unimplemented.adb \
9	s-inmaop.adb<s-inmaop-posix.adb \
10	s-intman.adb<s-intman-posix.adb \
11	s-osinte.adb<s-osinte-freebsd.adb \
12	@@ -1219,6 +1221,8 @@
13	a-numaux.ads<a-numaux-x86.ads \
14	g-bytswa.adb<g-bytswa-x86.adb \
15	g-socthi.adb<g-socthi-bsd.adb \
16	+ g-trasym.ads<g-trasym-unimplemented.ads \
17	+ g-trasym.adb<g-trasym-unimplemented.adb \
18	s-inmaop.adb<s-inmaop-posix.adb \
19	s-intman.adb<s-intman-posix.adb \
20	s-osinte.adb<s-osinte-freebsd.adb \
21	@@ -1253,6 +1257,8 @@
22	a-numaux.ads<a-numaux-x86.ads \
23	g-bytswa.adb<g-bytswa-x86.adb \
24	g-socthi.adb<g-socthi-bsd.adb \
25	+ g-trasym.ads<g-trasym-unimplemented.ads \
26	+ g-trasym.adb<g-trasym-unimplemented.adb \
27	s-inmaop.adb<s-inmaop-posix.adb \
28	s-intman.adb<s-intman-posix.adb \
29	s-osinte.adb<s-osinte-dragonfly.adb \
30	@@ -1288,6 +1294,8 @@
31	a-numaux.ads<a-numaux-x86.ads \
32	g-bytswa.adb<g-bytswa-x86.adb \
33	g-socthi.adb<g-socthi-bsd.adb \
34	+ g-trasym.ads<g-trasym-unimplemented.ads \
35	+ g-trasym.adb<g-trasym-unimplemented.adb \
36	s-inmaop.adb<s-inmaop-posix.adb \
37	s-intman.adb<s-intman-posix.adb \
38	s-osinte.adb<s-osinte-dragonfly.adb \
39	@@ -1322,6 +1330,8 @@
40	a-numaux.ads<a-numaux-x86.ads \
41	g-bytswa.adb<g-bytswa-x86.adb \
42	g-socthi.adb<g-socthi-bsd.adb \
43	+ g-trasym.ads<g-trasym-unimplemented.ads \
44	+ g-trasym.adb<g-trasym-unimplemented.adb \
45	s-inmaop.adb<s-inmaop-posix.adb \
46	s-intman.adb<s-intman-posix.adb \
47	s-osinte.adb<s-osinte-openbsd.adb \
48	@@ -1357,6 +1367,8 @@
49	a-numaux.ads<a-numaux-x86.ads \
50	g-bytswa.adb<g-bytswa-x86.adb \
51	g-socthi.adb<g-socthi-bsd.adb \
52	+ g-trasym.ads<g-trasym-unimplemented.ads \
53	+ g-trasym.adb<g-trasym-unimplemented.adb \
54	s-inmaop.adb<s-inmaop-posix.adb \
55	s-intman.adb<s-intman-posix.adb \
56	s-osinte.adb<s-osinte-openbsd.adb \
57	@@ -1391,6 +1403,8 @@
58	a-numaux.ads<a-numaux-x86.ads \
59	g-bytswa.adb<g-bytswa-x86.adb \
60	g-socthi.adb<g-socthi-netbsd.adb \
61	+ g-trasym.ads<g-trasym-unimplemented.ads \
62	+ g-trasym.adb<g-trasym-unimplemented.adb \
63	s-inmaop.adb<s-inmaop-posix.adb \
64	s-intman.adb<s-intman-posix.adb \
65	s-osinte.adb<s-osinte-netbsd.adb \
66	@@ -1435,6 +1449,8 @@
67	a-numaux.ads<a-numaux-x86.ads \
68	g-bytswa.adb<g-bytswa-x86.adb \
69	g-socthi.adb<g-socthi-netbsd.adb \
70	+ g-trasym.ads<g-trasym-unimplemented.ads \
71	+ g-trasym.adb<g-trasym-unimplemented.adb \
72	s-inmaop.adb<s-inmaop-posix.adb \
73	s-intman.adb<s-intman-posix.adb \
74	s-osinte.adb<s-osinte-netbsd.adb \
75	@@ -1472,6 +1488,8 @@
76	ifeq ($(strip $(filter-out arm% android eabi,$(targ))),)
77	LIBGNAT_TARGET_PAIRS = \
78	a-intnam.ads<a-intnam-linux.ads \
79	+ g-trasym.ads<g-trasym-unimplemented.ads \
80	+ g-trasym.adb<g-trasym-unimplemented.adb \
81	s-inmaop.adb<s-inmaop-posix.adb \
82	s-intman.adb<s-intman-posix.adb \
83	s-linux.ads<s-linux.ads \

Removed Link Here

(-)files/patch-libiberty__setprotitle.c (-14 lines)
1	--- libiberty/setproctitle.c.orig 2011-01-29 07:11:03 +0100
2	+++ libiberty/setproctitle.c 2011-01-29 07:28:55 +0100
3	@@ -40,9 +40,11 @@
4	void
5	setproctitle (const char *name ATTRIBUTE_UNUSED, ...)
6	{
7	+#ifndef __ANDROID__
8	#ifdef PR_SET_NAME
9	/* On Linux this sets the top visible "comm", but not necessarily
10	the name visible in ps. */
11	prctl (PR_SET_NAME, name);
12	#endif
13	+#endif
14	}