For ports that are explicitly enabled on armv6, also enable them

on armv7.  This has not been tested with an -exp run but should
"do no harm".

PR:		221894 (partial)
This commit is contained in:
Mark Linimon 2017-10-10 21:31:30 +00:00
parent 615a3fc1bb
commit 3ef3461740
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=451721
44 changed files with 62 additions and 54 deletions

View File

@ -22,6 +22,7 @@ INSTALL_TARGET= install-strip
OPTIONS_DEFINE= ASM
OPTIONS_DEFAULT_amd64= ASM
OPTIONS_DEFAULT_armv6= ASM
OPTIONS_DEFAULT_armv7= ASM
ASM_CONFIGURE_OFF= --disable-asm
ASM_DESC= Optimized assembler routines (requires MMX on x86)

View File

@ -13,7 +13,7 @@ COMMENT= Wav player and recorder
LICENSE= GPLv2 # only
LICENSE_FILE= ${WRKSRC}/COPYING
ONLY_FOR_ARCHS= amd64 armv6 i386
ONLY_FOR_ARCHS= amd64 armv6 armv7 i386
INSTALL_TARGET= install PREFIX="${STAGEDIR}${PREFIX}"

View File

@ -24,7 +24,7 @@ PLIST_FILES= ${JAVA_HOME}/jre/lib/ext/jssc-${PORTVERSION}.jar
.include <bsd.port.pre.mk>
.if ${ARCH} == "armv6" || ${ARCH} == "aarch64"
.if ${ARCH} == aarch64 || ${ARCH} == armv6 || ${ARCH} == armv7
JSSC_ARCH= arm
.else
JSSC_ARCH= ${ARCH}

View File

@ -34,7 +34,7 @@ USE_LDCONFIG= yes
.include <bsd.port.options.mk>
.if ${ARCH} == "aarch64" || ${ARCH} == "armv6"
.if ${ARCH} == aarch64 || ${ARCH} == armv6 || ${ARCH} == armv7
# db48 uses a deprecated instruction for mutexes on ARM, fbsd bug#197227
CONFIGURE_ARGS+= --enable-posixmutexes
.endif

View File

@ -12,7 +12,7 @@ COMMENT= Open-source distributed time series database
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
ONLY_FOR_ARCHS= amd64 armv6 i386
ONLY_FOR_ARCHS= amd64 armv6 armv7 i386
BUILD_DEPENDS= go>=1.8.1:lang/go

View File

@ -87,7 +87,7 @@ post-patch:
.include <bsd.port.pre.mk>
.if ${ARCH} == "armv6"
.if ${ARCH} == armv6 || ${ARCH} == armv7
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-config.h.cmake
.endif

View File

@ -147,7 +147,7 @@ post-install:
${MKDIR} ${STAGEDIR}${MY_TMPDIR}
.endif
.if ${ARCH} == "armv6"
.if ${ARCH} == armv6 || ${ARCH} == armv7
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-config.h.cmake
.endif

View File

@ -28,6 +28,7 @@ OPTIONS_SUB= yes
# firebird is currently only available on x86.
OPTIONS_EXCLUDE_aarch64= FIREBIRD
OPTIONS_EXCLUDE_armv6= FIREBIRD
OPTIONS_EXCLUDE_armv7= FIREBIRD
OPTIONS_EXCLUDE_mips= FIREBIRD
OPTIONS_EXCLUDE_mips64= FIREBIRD
OPTIONS_EXCLUDE_powerpc= FIREBIRD

View File

@ -20,7 +20,7 @@ USES= libtool pathfix
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
ONLY_FOR_ARCHS= i386 amd64 armv6 powerpc
ONLY_FOR_ARCHS= i386 amd64 armv6 armv7 powerpc
ONLY_FOR_ARCHS_REASON= hardcoded set of supported archs
.include <bsd.port.mk>

View File

@ -27,37 +27,37 @@ USE_LDCONFIG= yes
.include <bsd.port.pre.mk>
.if ${ARCH} == "amd64"
.if ${ARCH} == amd64
PLIST_SUB+= X86_64_ONLY=""
.else
PLIST_SUB+= X86_64_ONLY="@comment "
.endif
.if ${ARCH} == "i386"
.if ${ARCH} == i386
PLIST_SUB+= I386_ONLY=""
.else
PLIST_SUB+= I386_ONLY="@comment "
.endif
.if (${ARCH} == "amd64") || (${ARCH} == "i386")
.if (${ARCH} == amd64) || (${ARCH} == i386)
PLIST_SUB+= X86_ONLY=""
.else
PLIST_SUB+= X86_ONLY="@comment "
.endif
.if ${ARCH} == "arm" || ${ARCH} == "armv6"
.if ${ARCH} == arm || ${ARCH} == armv6 || ${ARCH} == armv7
PLIST_SUB+= ARM_ONLY=""
.else
PLIST_SUB+= ARM_ONLY="@comment "
.endif
.if ${ARCH} == "mips" || ${ARCH} == "mips64"
.if ${ARCH} == mips || ${ARCH} == mips64
PLIST_SUB+= MIPS_ONLY=""
.else
PLIST_SUB+= MIPS_ONLY="@comment "
.endif
.if ${ARCH} == "powerpc" || ${ARCH} == "powerpc64"
.if ${ARCH} == powerpc || ${ARCH} == powerpc64
PLIST_SUB+= PPC_ONLY=""
.else
PLIST_SUB+= PPC_ONLY="@comment "

View File

@ -13,7 +13,7 @@ LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING3
# untested on sparc64, might work
ONLY_FOR_ARCHS= aarch64 amd64 armv6 i386 mips powerpc powerpc64
ONLY_FOR_ARCHS= aarch64 amd64 armv6 armv7 i386 mips powerpc powerpc64
TEST_DEPENDS= runtest:misc/dejagnu

View File

@ -27,7 +27,7 @@ USE_GNOME= libxml2
PORTDOCS= *
ONLY_FOR_ARCHS= amd64 armv6 i386
ONLY_FOR_ARCHS= amd64 armv6 armv7 i386
ONLY_FOR_ARCHS_REASON= has not been ported to this architecture
OPTIONS_DEFINE= CAIRO DOCS

View File

@ -24,7 +24,7 @@ PORTDOCS= COPYRIGHT README *.htm
.include <bsd.port.pre.mk>
.if ${ARCH} == armv6 || ${ARCH} == i386 || ${ARCH} == mips || ${ARCH} == powerpc
.if ${ARCH} == armv6 || ${ARCH} == armv7 || ${ARCH} == i386 || ${ARCH} == mips || ${ARCH} == powerpc
CONFIGURE_ARGS+= --enable-32-bit
.else
CONFIGURE_ARGS+= --enable-64-bit

View File

@ -67,7 +67,7 @@ SNDIO_CONFIGURE_OFF= --disable-sndio
.include <bsd.port.pre.mk>
.if ${ARCH} == "armv6"
.if ${ARCH} == armv6 || ${ARCH} == armv7
CONFIGURE_ENV+= ASFLAGS=-meabi=5
.endif

View File

@ -26,6 +26,9 @@ GNU_CONFIGURE= yes
CFLAGS_armv6= -fno-builtin-sincos -fno-builtin-sin -fno-builtin-cos \
-fno-builtin-sincosf -fno-builtin-sinf -fno-builtin-cosf \
-fno-builtin-sincosl -fno-builtin-sinl -fno-builtin-cosl
CFLAGS_armv7= -fno-builtin-sincos -fno-builtin-sin -fno-builtin-cos \
-fno-builtin-sincosf -fno-builtin-sinf -fno-builtin-cosf \
-fno-builtin-sincosl -fno-builtin-sinl -fno-builtin-cosl
LDFLAGS+= -L${LOCALBASE}/lib
CPPFLAGS+= -I${LOCALBASE}/include
PLIST_SUB= PORTVERSION="${PORTVERSION}"

View File

@ -50,7 +50,7 @@ PLIST_SUB+= ARM_DRIVERS="@comment "
PLIST_SUB+= INTEL_DRIVER="@comment "
PLIST_SUB+= NOUVEAU_DRIVER=""
PLIST_SUB+= RADEON_DRIVERS=""
.elif ${ARCH} == armv6 || ${ARCH} == aarch64
.elif ${ARCH} == aarch64 || ${ARCH} == armv6 || ${ARCH} == armv7
PLIST_SUB+= ARM_DRIVERS=""
PLIST_SUB+= INTEL_DRIVER="@comment "
PLIST_SUB+= NOUVEAU_DRIVER="@comment "

View File

@ -52,9 +52,9 @@ GALLIUM_DRIVERS+= SVGA
. if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100000
EXTRA_PATCHES+= ${PATCHDIR}/extra-src_mesa_drivers_dri_i965_intel__screen.c
. endif
.elif ${ARCH} == armv6 || ${ARCH} == aarch64
.elif ${ARCH} == aarch64 || ${ARCH} == armv6 || ${ARCH} == armv7
GALLIUM_DRIVERS+= FREEDRENO VC4
. if ${ARCH} == armv6
. if ${ARCH} == armv6 || ${ARCH} == armv7
EXTRA_PATCHES+= ${PATCHDIR}/extra-src_gallium_drivers_vc4_Makefile.in
. endif
.endif

View File

@ -48,6 +48,7 @@ OPTIONS_GROUP_PERFORMANCE= EIGEN3 TBB
OPTIONS_GROUP_SIMD= ${OPTIONS_GROUP_SIMD_${MACHINE_ARCH}}
OPTIONS_GROUP_SIMD_amd64= ${OPTIONS_GROUP_SIMD_i386}
OPTIONS_GROUP_SIMD_armv6= NEON VFPV3
OPTIONS_GROUP_SIMD_armv7= NEON VFPV3
OPTIONS_GROUP_SIMD_i386= SSE SSE2 SSE3 SSSE3 SSE41 SSE42 AVX AVX2
OPTIONS_GROUP_VIDEO= FFMPEG GSTREAMER GSTREAMER0 V4L XINE
OPTIONS_RADIO= GUI

View File

@ -48,7 +48,8 @@ PORTDOCS= *
.include <bsd.port.options.mk>
# PR 220612: remove fork="true" in javac and fork="yes" in junit tasks
.if ${ARCH}=="armv6"
# NB: as of adding armv7, the patchname is kind of obsolete.
.if ${ARCH} == armv6 || ${ARCH} == armv7
EXTRA_PATCHES+= ${FILESDIR}/armv6-patch-bc+-build.xml
.endif

View File

@ -169,7 +169,7 @@ CONFIGURE_ARGS+=--enable-dirty-schedulers
MAKE_ARGS+= ARCH=x86
.endif
.if ${ARCH} == armv6
.if ${ARCH} == armv6 || ${ARCH} == armv7
MAKE_ARGS+= ARCH=arm
.endif

View File

@ -163,7 +163,7 @@ CONFIGURE_ARGS+=--enable-dirty-schedulers
MAKE_ARGS+= ARCH=x86
.endif
.if ${ARCH} == armv6
.if ${ARCH} == armv6 || ${ARCH} == armv7
MAKE_ARGS+= ARCH=arm
.endif

View File

@ -184,7 +184,7 @@ CONFIGURE_ARGS+=--enable-dirty-schedulers
MAKE_ARGS+= ARCH=x86
.endif
.if ${ARCH} == armv6
.if ${ARCH} == armv6 || ${ARCH} == armv7
MAKE_ARGS+= ARCH=arm
.endif

View File

@ -175,7 +175,7 @@ CONFIGURE_ARGS+=--enable-dirty-schedulers
MAKE_ARGS+= ARCH=x86
.endif
.if ${ARCH} == armv6
.if ${ARCH} == armv6 || ${ARCH} == armv7
MAKE_ARGS+= ARCH=arm
.endif

View File

@ -201,7 +201,7 @@ CONFIGURE_ARGS+=--enable-dirty-schedulers
MAKE_ARGS+= ARCH=x86
.endif
.if ${ARCH} == armv6
.if ${ARCH} == armv6 || ${ARCH} == armv7
MAKE_ARGS+= ARCH=arm
.endif

View File

@ -31,18 +31,18 @@ sh_OLD_CMD= "/usr/bin/env bash"
sh_CMD= ${SH}
WRKSRC= ${WRKDIR}/go
ONLY_FOR_ARCHS= i386 amd64 armv6
ONLY_FOR_ARCHS= i386 amd64 armv6 armv7
OPTIONS_DEFINE= GO387
GO387_DESC= Do not generate code with SSE2 (for old x86 CPU)
.include <bsd.port.pre.mk>
.if ${ARCH} == "i386"
.if ${ARCH} == i386
GOARCH=386
.elif ${ARCH} == "amd64"
GOARCH=amd64
.elif ${ARCH} == "armv6"
.elif ${ARCH} == armv6 || ${ARCH} == armv7
GOARCH=arm
.else
IGNORE= unknown arch ${ARCH}

View File

@ -29,7 +29,7 @@ sh_CMD= ${SH}
WRKSRC= ${WRKDIR}/go
ONLY_FOR_ARCHS= amd64 armv6 i386
ONLY_FOR_ARCHS= amd64 armv6 armv7 i386
.include <bsd.port.pre.mk>
@ -38,13 +38,13 @@ ONLY_FOR_ARCHS= amd64 armv6 i386
CC=clang
.endif
.if ${ARCH} == "i386"
.if ${ARCH} == i386
GOARCH=386
GOOBJ=8
.elif ${ARCH} == "amd64"
.elif ${ARCH} == amd64
GOARCH=amd64
GOOBJ=6
.elif ${ARCH} == "armv6"
.elif ${ARCH} == armv6 || ${ARCH} == armv7
GOARCH=arm
GOOBJ=5
.else

View File

@ -16,7 +16,7 @@ USE_LDCONFIG= yes
PLIST_SUB+= VERSION=${DISTVERSION}
ONLY_FOR_ARCHS= amd64 armv6 i386
ONLY_FOR_ARCHS= amd64 armv6 armv7 i386
ONLY_FOR_ARCHS_REASON= Requires newer gcc/clang to compile.
post-install:

View File

@ -65,7 +65,7 @@ MAKE_ENV= MONO_SHARED_DIR="${WRKDIR}" \
TEST_TARGET= check
TEST_WRKSRC= ${WRKSRC}/mono/tests
ONLY_FOR_ARCHS= amd64 armv6 i386 powerpc
ONLY_FOR_ARCHS= amd64 armv6 armv7 i386 powerpc
PORTSCOUT= limit:^\d+\.\d+\.[1-9]\d*

View File

@ -49,18 +49,18 @@ PLIST_SUB= DISTNAME=${SWIPLDIR} ARCH=${ARCH} OS=${OPSYS:tl} \
.include <bsd.port.pre.mk>
.if (${ARCH} == "i386" || ${ARCH} == "powerpc" || ${ARCH} == "armv6")
.if (${ARCH} == armv6 || ${ARCH} == armv7 || ${ARCH} == i386 || ${ARCH} == powerpc)
PLIST_SUB+= BITS=32
.else
PLIST_SUB+= BITS=64
.endif
.if (${ARCH} == "amd64")
.if (${ARCH} == amd64)
ARCH= x86_64
.endif
post-configure:
.if ${ARCH} != "i386"
.if ${ARCH} != i386
@${REINPLACE_CMD} -e '/^CMFLAGS=/s/$$/ -fPIC/' \
${WRKSRC}/packages/Dialect.defs
.endif

View File

@ -20,7 +20,7 @@ BUILDENV= ${SETENV} TMPDIR="${WRKDIR}"
.include <bsd.port.pre.mk>
.if ${ARCH} == "i386" || ${ARCH} == "powerpc" || ${ARCH} == "armv6" || ${ARCH} == "mips"
.if ${ARCH} == armv6 || ${ARCH} == armv7 || ${ARCH} == i386 || ${ARCH} == mips || ${ARCH} == powerpc
LPSOLVE_ARCH= ux32
.else
LPSOLVE_ARCH= ux64

View File

@ -164,7 +164,7 @@ COMPAT_HEADERS=libavcodec/avcodec.h \
.include <bsd.port.pre.mk>
.if ${ARCH} == armv6
.if ${ARCH} == armv6 || ${ARCH} == armv7
CONFIGURE_ENV+= ASFLAGS=-no-integrated-as
CFLAGS+= -no-integrated-as
.endif

View File

@ -49,6 +49,7 @@ CFLAGS_i386+= -mstack-alignment=16 -mstackrealign
.endif # ${CHOSEN_COMPILER_TYPE} == clang
CFLAGS_armv6+= -no-integrated-as
CFLAGS_armv7+= -no-integrated-as
# Extra build options for debugging
# =================================

View File

@ -13,7 +13,7 @@ LICENSE= MIT
BUILD_DEPENDS= go>=1.6.0:lang/go
ONLY_FOR_ARCHS= i386 amd64 armv6
ONLY_FOR_ARCHS= amd64 armv6 armv7 i386
USE_RC_SUBR= kapacitord

View File

@ -19,7 +19,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}/konference
PLIST_FILES= lib/asterisk/modules/app_konference.so
ONLY_FOR_ARCHS= amd64 armv6 i386 powerpc
ONLY_FOR_ARCHS= amd64 armv6 armv7 i386 powerpc
ONLY_FOR_ARCHS_REASON= not yet ported to this architecture
OPTIONS_DEFINE= OPTIMIZED_CFLAGS

View File

@ -16,7 +16,7 @@ LIB_DEPENDS= libasound.so:audio/alsa-lib \
libspeex.so:audio/speex \
libgsm.so:audio/gsm
ONLY_FOR_ARCHS= amd64 armv6 i386 sparc64
ONLY_FOR_ARCHS= amd64 armv6 armv7 i386 sparc64
USES= autoreconf bison gmake shebangfix
SHEBANG_FILES= share/scripts/banbrutes.php \

View File

@ -22,7 +22,7 @@ MAKE_JOBS_UNSAFE=yes
.include <bsd.port.options.mk>
# Is there a better way to detect 32-bit systems?
.if ${ARCH} == "armv6" || ${ARCH} == "i386" || ${ARCH} == "mips" || ${ARCH} == "powerpc"
.if ${ARCH} == armv6 || ${ARCH} == armv7 || ${ARCH} == i386 || ${ARCH} == mips || ${ARCH} == powerpc
MAKE_ENV+= KIM_SYSTEM32="yes"
.endif

View File

@ -10,7 +10,7 @@ DISTNAME= cl${PORTVERSION:S/.//g}
MAINTAINER= ale@FreeBSD.org
COMMENT= Powerful security programming toolkit
ONLY_FOR_ARCHS= amd64 armv6 i386
ONLY_FOR_ARCHS= amd64 armv6 armv7 i386
OPTIONS_DEFINE= DOCS

View File

@ -14,7 +14,7 @@ COMMENT= Pythin binding for cryptlib
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING
ONLY_FOR_ARCHS= i386 amd64 armv6
ONLY_FOR_ARCHS= i386 amd64 armv6 armv7
USES= python:2 zip:infozip
USE_PYTHON= distutils autoplist

View File

@ -13,7 +13,7 @@ COMMENT= Utilities for running CloudABI programs
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
ONLY_FOR_ARCHS= aarch64 amd64 armv6 i386
ONLY_FOR_ARCHS= aarch64 amd64 armv6 armv7 i386
ONLY_FOR_ARCHS_REASON= CloudABI has not yet been ported to other architectures
BUILD_DEPENDS= ${LOCALBASE}/include/cloudabi_types.h:devel/cloudabi \

View File

@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= nasm:devel/nasm
RUN_DEPENDS= mtools:emulators/mtools
ONLY_FOR_ARCHS= aarch64 amd64 armv6 i386
ONLY_FOR_ARCHS= aarch64 amd64 armv6 armv7 i386
ONLY_FOR_ARCHS_REASON= linux is not available for ${ARCH}
USES= perl5 gmake tar:xz

View File

@ -22,7 +22,7 @@ RUN_DEPENDS= bash:shells/bash \
${PYTHON_PKGNAMEPREFIX}iniparse>0:devel/py-iniparse \
${PYTHON_PKGNAMEPREFIX}urlgrabber>0:www/py-urlgrabber
ONLY_FOR_ARCHS= amd64 aarch64 armv6 i386
ONLY_FOR_ARCHS= aarch64 amd64 armv6 armv7 i386
ONLY_FOR_ARCHS_REASON= linux is not available for ${ARCH}
USES= cpe gettext gmake python shebangfix

View File

@ -44,7 +44,7 @@ USE_LDCONFIG= yes
CONFLICTS_INSTALL= node[456]-[0-9]* node01[02]-[0-9]* node-devel-[0-9]* iojs-[0-9]*
ONLY_FOR_ARCHS= aarch64 amd64 armv6 i386
ONLY_FOR_ARCHS= aarch64 amd64 armv6 armv7 i386
CONFIGURE_ARGS= --prefix=${PREFIX_RELDEST} \
--without-npm \
@ -77,7 +77,7 @@ IGNORE= cannot build node.js with LibreSSL. You must enable BUNDLED_SSL
.include <bsd.port.pre.mk>
.if ${ARCH} == "armv6"
.if ${ARCH} == armv6 || ${ARCH} == armv7
CONFIGURE_ARGS+=--openssl-no-asm
.endif

View File

@ -43,7 +43,7 @@ USE_LDCONFIG= yes
CONFLICTS_INSTALL= node[45]-[0-9]* node01[02]-[0-9]* node-[0-9]* node-devel-[0-9]* iojs-[0-9]*
ONLY_FOR_ARCHS= amd64 armv6 i386
ONLY_FOR_ARCHS= amd64 armv6 armv7 i386
CONFIGURE_ARGS= --prefix=${PREFIX_RELDEST} \
--without-npm \
@ -76,7 +76,7 @@ IGNORE= cannot build node.js with LibreSSL. You must enable BUNDLED_SSL
.include <bsd.port.pre.mk>
.if ${ARCH} == "armv6"
.if ${ARCH} == armv6 || ${ARCH} == armv7
CONFIGURE_ARGS+=--openssl-no-asm
.endif

View File

@ -24,7 +24,7 @@ TOOLS_ONLY_DESC= Do not install window manager, only tools
.include <bsd.port.options.mk>
.if ${ARCH} == "armv6"
.if ${ARCH} == armv6 || ${ARCH} == armv7
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src_Toolbar.cc
.endif