diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2016-05-22 01:14:16 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2016-05-22 01:14:16 +0000 |
| commit | 1af726888655ad89da6d22adde4823c3e2a40f68 (patch) | |
| tree | 74e3cb5ef4f5686fee48ea5dfb0921880f555a7b | |
| parent | b7e5438b177d77c8d6cbe510bcc34e0e57978205 (diff) | |
| download | ports-1af726888655ad89da6d22adde4823c3e2a40f68.tar.gz ports-1af726888655ad89da6d22adde4823c3e2a40f68.zip | |
MFH: r415618
devel/fb-adb: unbreak c6_64 build after r411857
===> Extracting for fb-adb-1.4.4.124
=> SHA256 Checksum OK for android-ndk-r10e-linux-x86_64.bin.
=> SHA256 Checksum OK for facebook-fb-adb-1.4.4-124-gb230619_GH0.tar.gz.
tar: Error opening archive: Unrecognized archive format
*** Error code 1
Approved by: ports-secteam blanket
Notes
Notes:
svn path=/branches/2016Q2/; revision=415620
| -rw-r--r-- | devel/fb-adb/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/devel/fb-adb/Makefile b/devel/fb-adb/Makefile index bb4313e71746..5856787d8d8b 100644 --- a/devel/fb-adb/Makefile +++ b/devel/fb-adb/Makefile @@ -62,13 +62,12 @@ DISTNAME_ndk= android-ndk-r10e-linux-${LINUX_RPM_ARCH:C/i.86/x86/} WRKSRC_ndk= ${WRKDIR}/${DISTNAME_ndk:C/(-[^-]+){2}$//} .endif NDK_BUILD_DEPENDS= ${LINUX_BASE_PORT} -NDK_USES= 7z:partial${NDK_7z_ARGS_${LINUX_RPM_ARCH}} +NDK_USES= 7z:partial${OVERRIDE_LINUX_BASE_PORT:M*64:C/.+/,p7zip/} NDK_USE= LINUX=yes # build 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_7z_ARGS_x86_64= ,p7zip # libarchive fails to read NDK_BUILD_DEPENDS_OFF= ${LOCALBASE}/android/ARMv7/bin/arm-aux-linux-androideabi-gcc:lang/gnatdroid-armv7 \ ${LOCALBASE}/android-x86/x86_32/bin/i686-aux-linux-android-gcc:lang/gnatdroid-x86 .if defined(.PARSEDIR) |