Index: head/lang/gnatdroid-binutils-x86/Makefile =================================================================== --- head/lang/gnatdroid-binutils-x86/Makefile (revision 402734) +++ head/lang/gnatdroid-binutils-x86/Makefile (revision 402735) @@ -1,18 +1,20 @@ # Created by: John Marino # $FreeBSD$ PORTREVISION= 0 PKGNAMESUFFIX= -x86 MAINTAINER= marino@FreeBSD.org COMMENT= Infrastructure for C/Ada Android cross-compiler (x86) BRANCH2= x86_32 XCCTARGET= i686-aux-linux-android PREFIX= ${LOCALBASE}/android-x86 SYSROOT= gnatdroid-sysroot-x86 MASTERDIR= ${.CURDIR}/../../lang/gnatdroid-binutils PLIST= ${.CURDIR}/pkg-plist DESCR= ${.CURDIR}/pkg-descr +PLIST_SUB= AMD64=${ARCH:S/i386/"@comment "/:S/${ARCH}/""/} + .include "${MASTERDIR}/Makefile" Index: head/lang/gnatdroid-binutils-x86/pkg-plist =================================================================== --- head/lang/gnatdroid-binutils-x86/pkg-plist (revision 402734) +++ head/lang/gnatdroid-binutils-x86/pkg-plist (revision 402735) @@ -1,95 +1,95 @@ %%BRANCH2%%/bin/%%TARGET%%-addr2line %%BRANCH2%%/bin/%%TARGET%%-ar %%BRANCH2%%/bin/%%TARGET%%-as %%BRANCH2%%/bin/%%TARGET%%-c++filt %%BRANCH2%%/bin/%%TARGET%%-elfedit %%BRANCH2%%/bin/%%TARGET%%-gprof %%BRANCH2%%/bin/%%TARGET%%-ld %%BRANCH2%%/bin/%%TARGET%%-ld.bfd %%BRANCH2%%/bin/%%TARGET%%-nm %%BRANCH2%%/bin/%%TARGET%%-objcopy %%BRANCH2%%/bin/%%TARGET%%-objdump %%BRANCH2%%/bin/%%TARGET%%-ranlib %%BRANCH2%%/bin/%%TARGET%%-readelf %%BRANCH2%%/bin/%%TARGET%%-size %%BRANCH2%%/bin/%%TARGET%%-strings %%BRANCH2%%/bin/%%TARGET%%-strip %%BRANCH2%%/%%TARGET%%/bin/ar %%BRANCH2%%/%%TARGET%%/bin/as %%BRANCH2%%/%%TARGET%%/bin/ld %%BRANCH2%%/%%TARGET%%/bin/ld.bfd %%BRANCH2%%/%%TARGET%%/bin/nm %%BRANCH2%%/%%TARGET%%/bin/objcopy %%BRANCH2%%/%%TARGET%%/bin/objdump %%BRANCH2%%/%%TARGET%%/bin/ranlib %%BRANCH2%%/%%TARGET%%/bin/strip %%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf32_x86_64.x %%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf32_x86_64.xbn %%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf32_x86_64.xc %%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf32_x86_64.xd %%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf32_x86_64.xdc %%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf32_x86_64.xdw %%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf32_x86_64.xn %%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf32_x86_64.xr %%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf32_x86_64.xs %%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf32_x86_64.xsc %%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf32_x86_64.xsw %%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf32_x86_64.xu %%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf32_x86_64.xw %%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_i386.x %%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_i386.xbn %%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_i386.xc %%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_i386.xd %%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_i386.xdc %%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_i386.xdw %%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_i386.xn %%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_i386.xr %%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_i386.xs %%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_i386.xsc %%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_i386.xsw %%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_i386.xu %%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_i386.xw -%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_k1om.x -%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_k1om.xbn -%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_k1om.xc -%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_k1om.xd -%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_k1om.xdc -%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_k1om.xdw -%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_k1om.xn -%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_k1om.xr -%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_k1om.xs -%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_k1om.xsc -%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_k1om.xsw -%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_k1om.xu -%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_k1om.xw -%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_l1om.x -%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_l1om.xbn -%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_l1om.xc -%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_l1om.xd -%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_l1om.xdc -%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_l1om.xdw -%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_l1om.xn -%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_l1om.xr -%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_l1om.xs -%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_l1om.xsc -%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_l1om.xsw -%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_l1om.xu -%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_l1om.xw -%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_x86_64.x -%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_x86_64.xbn -%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_x86_64.xc -%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_x86_64.xd -%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_x86_64.xdc -%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_x86_64.xdw -%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_x86_64.xn -%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_x86_64.xr -%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_x86_64.xs -%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_x86_64.xsc -%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_x86_64.xsw -%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_x86_64.xu -%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_x86_64.xw +%%AMD64%%%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_k1om.x +%%AMD64%%%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_k1om.xbn +%%AMD64%%%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_k1om.xc +%%AMD64%%%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_k1om.xd +%%AMD64%%%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_k1om.xdc +%%AMD64%%%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_k1om.xdw +%%AMD64%%%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_k1om.xn +%%AMD64%%%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_k1om.xr +%%AMD64%%%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_k1om.xs +%%AMD64%%%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_k1om.xsc +%%AMD64%%%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_k1om.xsw +%%AMD64%%%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_k1om.xu +%%AMD64%%%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_k1om.xw +%%AMD64%%%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_l1om.x +%%AMD64%%%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_l1om.xbn +%%AMD64%%%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_l1om.xc +%%AMD64%%%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_l1om.xd +%%AMD64%%%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_l1om.xdc +%%AMD64%%%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_l1om.xdw +%%AMD64%%%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_l1om.xn +%%AMD64%%%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_l1om.xr +%%AMD64%%%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_l1om.xs +%%AMD64%%%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_l1om.xsc +%%AMD64%%%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_l1om.xsw +%%AMD64%%%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_l1om.xu +%%AMD64%%%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_l1om.xw +%%AMD64%%%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_x86_64.x +%%AMD64%%%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_x86_64.xbn +%%AMD64%%%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_x86_64.xc +%%AMD64%%%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_x86_64.xd +%%AMD64%%%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_x86_64.xdc +%%AMD64%%%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_x86_64.xdw +%%AMD64%%%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_x86_64.xn +%%AMD64%%%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_x86_64.xr +%%AMD64%%%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_x86_64.xs +%%AMD64%%%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_x86_64.xsc +%%AMD64%%%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_x86_64.xsw +%%AMD64%%%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_x86_64.xu +%%AMD64%%%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_x86_64.xw %%BRANCH2%%/%%TARGET%%/lib/ldscripts/i386linux.x %%BRANCH2%%/%%TARGET%%/lib/ldscripts/i386linux.xbn %%BRANCH2%%/%%TARGET%%/lib/ldscripts/i386linux.xn %%BRANCH2%%/%%TARGET%%/lib/ldscripts/i386linux.xr %%BRANCH2%%/%%TARGET%%/lib/ldscripts/i386linux.xu