summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjbeich <jbeich@FreeBSD.org>2016-05-22 01:11:52 +0000
committerjbeich <jbeich@FreeBSD.org>2016-05-22 01:11:52 +0000
commit2fc31287e07394ad4da4ca8c65e5c92d587b90a2 (patch)
treeef2adc530417e481d16ff6c78df7978345e69fdd
parentcc0907d401c20e1175de38442a89a579e025c56d (diff)
downloadFreeBSD-ports-2fc31287e07394ad4da4ca8c65e5c92d587b90a2.zip
FreeBSD-ports-2fc31287e07394ad4da4ca8c65e5c92d587b90a2.tar.gz
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
-rw-r--r--devel/fb-adb/Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/devel/fb-adb/Makefile b/devel/fb-adb/Makefile
index 999c1fe..ae032c6 100644
--- a/devel/fb-adb/Makefile
+++ b/devel/fb-adb/Makefile
@@ -59,13 +59,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)
OpenPOWER on IntegriCloud