Date: Sun, 24 May 2020 09:25:14 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r536371 - head/devel/fb-adb Message-ID: <202005240925.04O9PEba030893@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Sun May 24 09:25:14 2020 New Revision: 536371 URL: https://svnweb.freebsd.org/changeset/ports/536371 Log: devel/fb-adb: drop non-NDK support lang/gnatdroid-armv7 has expired and is about to be removed. PR: 246684 Submitted by: rene Modified: head/devel/fb-adb/Makefile (contents, props changed) Modified: head/devel/fb-adb/Makefile ============================================================================== --- head/devel/fb-adb/Makefile Sun May 24 09:13:34 2020 (r536370) +++ head/devel/fb-adb/Makefile Sun May 24 09:25:14 2020 (r536371) @@ -3,8 +3,16 @@ PORTNAME= fb-adb DISTVERSION= 1.4.4-126 DISTVERSIONSUFFIX= -g6fd78ae -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel comms +.if !defined(ANDROID_NDK) +# XXX Convert into USES=android once more things depend on it +MASTER_SITES= https://dl.google.com/android/ndk/:7z \ + https://dl.google.com/android/repository/:zip +DISTFILES= ${DISTFILES_${ARCH}} +DISTFILES_i386= android-ndk-r10e-linux-x86.bin:7z +DISTFILES_amd64=android-ndk-r12b-linux-x86_64.zip:zip +.endif PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES= 1b5524282981.patch:-p1 \ @@ -21,6 +29,9 @@ COMMENT= Better shell for Android devices LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE +ONLY_FOR_ARCHS= amd64 i386 +IGNORE_DragonFly= requires linuxulator for Android NDK + BUILD_DEPENDS= xxd:editors/vim-console \ ${BASH_CMD}:shells/${BASH_CMD:T} RUN_DEPENDS= adb:devel/android-tools-adb @@ -28,12 +39,19 @@ RUN_DEPENDS= adb:devel/android-tools-adb USE_GITHUB= yes GH_ACCOUNT= facebook -USES= autoreconf gmake ncurses perl5 python:3.4+,build +USES= 7z:partial autoreconf gmake linux ncurses perl5 python:3.4+,build +USE_LINUX= base:build USE_PERL5= build # pod2man BASH_CMD?= bash # can be zsh +NDK_SHELL= ${LINUXBASE}/bin/sh +# Prefer NDK from environment +WRKSRC_ndk= ${ANDROID_NDK:U${WRKDIR}/${DISTFILES:M*ndk*:R:C/(-[^-]+){2}$//}} GNU_CONFIGURE= yes CONFIGURE_OUTSOURCE= yes CONFIGURE_ENV= PYTHON3="${PYTHON_CMD}" +CONFIGURE_ENV+= ANDROID_NDK="${WRKSRC_ndk}" \ + ANDROID_NDK_SHELL="${NDK_SHELL}" \ + NDK_TMPDIR="${WRKDIR}" INSTALL_TARGET= install-strip PLIST_FILES= bin/${PORTNAME} \ man/man1/${PORTNAME}.1.gz @@ -47,39 +65,13 @@ CONFIGURE_ENV+= HOST_CFLAGS="${CPPFLAGS} ${CFLAGS:N-[O STUB_LDFLAGS="${STUB_LDFLAGS}" \ LDFLAGS="" LIBS="" -OPTIONS_DEFINE= ASSERT BASH DEBUG NDK -OPTIONS_DEFAULT=NDK -OPTIONS_EXCLUDE=${ARCH:Namd64:Ni386:C/.+/NDK/} -OPTIONS_EXCLUDE_DragonFly=NDK +OPTIONS_DEFINE= ASSERT BASH DEBUG ASSERT_CONFIGURE_ENABLE=checking BASH_DESC= Install JSON parser used by bash-completion BASH_RUN_DEPENDS= jq:textproc/jq DEBUG_CONFIGURE_ENABLE= debuggable-stubs -# XXX Convert into USES=android once more things depend on it -NDK_DESC= Build target stubs using Android NDK -NDK_MASTER_SITES= https://dl.google.com/android/ndk/:7z \ - https://dl.google.com/android/repository/:zip -.if defined(ANDROID_NDK) -# Prefer NDK from environment -WRKSRC_ndk= ${ANDROID_NDK} -.else -NDK_DISTFILES= ${NDK_DISTFILES_${ARCH}} -NDK_DISTFILES_i386= android-ndk-r10e-linux-x86.bin:7z -NDK_DISTFILES_amd64= android-ndk-r12b-linux-x86_64.zip:zip -WRKSRC_ndk= ${WRKDIR}/${NDK_DISTFILES:R:C/(-[^-]+){2}$//} -.endif -NDK_USES= 7z:partial linux -NDK_USE= LINUX=base:build -NDK_SHELL= ${LINUXBASE}/bin/sh -NDK_CONFIGURE_ENV= ANDROID_NDK="${WRKSRC_ndk}" \ - ANDROID_NDK_SHELL="${NDK_SHELL}" \ - NDK_TMPDIR="${WRKDIR}" -NDK_BUILD_DEPENDS_OFF= ${LOCALBASE}/android/ARMv7/bin/arm-aux-linux-androideabi-gcc:lang/gnatdroid-armv7 -NDK_CONFIGURE_ENV_OFF= PATH="${NDK_BUILD_DEPENDS_OFF:C/:.*//:H:ts:}:$$PATH" -NDK_CONFIGURE_OFF= --with-android-ndk=system - post-extract: # XXX gold: fatal error: a.out: Invalid argument @for f in $$(${FIND} ${WRKSRC_ndk} -type l -name '*-ld'); do \ @@ -89,17 +81,8 @@ post-extract: post-patch: # XXX Decouple -Werror from --enable-checking (ASSERT=on) @${REINPLACE_CMD} -e '/CPPFLAGS.*-Werror/d' ${WRKSRC}/configure.ac - -post-patch-NDK-on: @${REINPLACE_CMD} 's,mkdir,/compat/linux/../../bin/mkdir,' \ ${WRKSRC_ndk}/build/tools/make-standalone-toolchain.sh \ ${WRKSRC_ndk}/build/tools/ndk-common.sh - -post-patch-NDK-off: - @${REINPLACE_CMD} -i '.aux.bak' -e 's/linux-android/aux-&/' \ - ${WRKSRC}/stub-*/configure -# XXX lang/gnatdroid-x86 no longer exists - @${REINPLACE_CMD} -i '.x86-off.bak' -e 's/stub-x86[^,]*, //g' \ - ${WRKSRC}/configure.ac .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202005240925.04O9PEba030893>