svn commit: r415620 - branches/2016Q2/devel/fb-adb

[Jan Beich]

Author: jbeich
Date: Sun May 22 01:14:16 2016
New Revision: 415620
URL: https://svnweb.freebsd.org/changeset/ports/415620

Log:
  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

Modified:
  branches/2016Q2/devel/fb-adb/Makefile
Directory Properties:
  branches/2016Q2/   (props changed)

Modified: branches/2016Q2/devel/fb-adb/Makefile
==============================================================================
--- branches/2016Q2/devel/fb-adb/Makefile	Sun May 22 01:12:09 2016	(r415619)
+++ branches/2016Q2/devel/fb-adb/Makefile	Sun May 22 01:14:16 2016	(r415620)
@@ -62,13 +62,12 @@ DISTNAME_ndk=		android-ndk-r10e-linux-${
 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)