diff options
| author | jbeich <jbeich@FreeBSD.org> | 2015-12-03 03:27:54 +0800 |
|---|---|---|
| committer | jbeich <jbeich@FreeBSD.org> | 2015-12-03 03:27:54 +0800 |
| commit | 01ba29c9a724acbe93aea3d9959d47a29184d6f6 (patch) | |
| tree | de873f43d91effe6187bde48f1187062732068f5 /devel/fb-adb | |
| parent | ac2c2208e2213fb82a5ecfbdd0f4b201ac464ff5 (diff) | |
| download | freebsd-ports-gnome-01ba29c9a724acbe93aea3d9959d47a29184d6f6.tar.gz freebsd-ports-gnome-01ba29c9a724acbe93aea3d9959d47a29184d6f6.tar.zst freebsd-ports-gnome-01ba29c9a724acbe93aea3d9959d47a29184d6f6.zip | |
devel/fb-adb: update to 1.4.4.115
- Enable Android x86 stub for NDK=off
Changes: https://github.com/facebook/fb-adb/compare/d447d38...a682c99
Diffstat (limited to 'devel/fb-adb')
| -rw-r--r-- | devel/fb-adb/Makefile | 18 | ||||
| -rw-r--r-- | devel/fb-adb/distinfo | 4 |
2 files changed, 12 insertions, 10 deletions
diff --git a/devel/fb-adb/Makefile b/devel/fb-adb/Makefile index 940c9f177e82..07674ee629ee 100644 --- a/devel/fb-adb/Makefile +++ b/devel/fb-adb/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME= fb-adb -DISTVERSION= 1.4.4-113 -DISTVERSIONSUFFIX= -gd447d38 +DISTVERSION= 1.4.4-115 +DISTVERSIONSUFFIX= -ga682c99 CATEGORIES= devel DISTFILES= ${DISTNAME}${EXTRACT_SUFX} @@ -68,8 +68,13 @@ NDK_SHELL= ${SETENV} UNAME_s=Linux UNAME_m=${LINUX_RPM_ARCH} ${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:${PORTSDIR}/lang/gnatdroid-armv7 -NDK_CONFIGURE_ENV_OFF= PATH="${NDK_BUILD_DEPENDS_OFF:C/:.*//:H}:$$PATH" +NDK_BUILD_DEPENDS_OFF= ${LOCALBASE}/android/ARMv7/bin/arm-aux-linux-androideabi-gcc:${PORTSDIR}/lang/gnatdroid-armv7 \ + ${LOCALBASE}/android-x86/x86_32/bin/i686-aux-linux-android-gcc:${PORTSDIR}/lang/gnatdroid-x86 +.if defined(.PARSEDIR) +NDK_CONFIGURE_ENV_OFF= PATH="${NDK_BUILD_DEPENDS_OFF:C/:.*//:H:ts:}:$$PATH" +.else +NDK_CONFIGURE_ENV_OFF= PATH="${LOCALBASE}/android/ARMv7/bin:${LOCALBASE}/android-x86/x86_32/bin:$$PATH" +.endif NDK_CONFIGURE_OFF= --with-android-ndk=system post-extract: @@ -83,10 +88,7 @@ post-patch: @${REINPLACE_CMD} -e '/CPPFLAGS.*-Werror/d' ${WRKSRC}/configure.ac post-patch-NDK-off: -# XXX lang/gnatdroid-x86 doesn't exist yet - @${REINPLACE_CMD} -i '.x86-off.bak' -e 's/stub-x86[^,]*, //g' \ - ${WRKSRC}/configure.ac - @${REINPLACE_CMD} -i '.aux.bak' -e 's/linux-androideabi/aux-&/' \ + @${REINPLACE_CMD} -i '.aux.bak' -e 's/linux-android/aux-&/' \ ${WRKSRC}/stub-*/configure # XXX D4157: Similar to USES=qmake:outsource, merge into Mk/Uses/autoreconf.mk diff --git a/devel/fb-adb/distinfo b/devel/fb-adb/distinfo index 8ad14e2db6d3..148b4671e036 100644 --- a/devel/fb-adb/distinfo +++ b/devel/fb-adb/distinfo @@ -1,5 +1,5 @@ -SHA256 (facebook-fb-adb-1.4.4-113-gd447d38_GH0.tar.gz) = 0e9bad245061d64a5a5dbc2f18559324a3e04910b4b9ecdbd05266d6e1752e28 -SIZE (facebook-fb-adb-1.4.4-113-gd447d38_GH0.tar.gz) = 249116 +SHA256 (facebook-fb-adb-1.4.4-115-ga682c99_GH0.tar.gz) = a07fe3c44dc89df88fc3068ea6b55b14361cba4d4f0507df319242986a4b8d20 +SIZE (facebook-fb-adb-1.4.4-115-ga682c99_GH0.tar.gz) = 249759 SHA256 (android-ndk-r10e-linux-x86.bin) = 92b07d25aaad9b341a7f2b2a62402d508e948bf2dea3ee7b65a6aeb18bca7df5 SIZE (android-ndk-r10e-linux-x86.bin) = 394281908 SHA256 (android-ndk-r10e-linux-x86_64.bin) = 102d6723f67ff1384330d12c45854315d6452d6510286f4e5891e00a5a8f1d5a |