svn commit: r415616 - head/devel/fb-adb
Jan Beich
jbeich at FreeBSD.org
Sun May 22 01:10:55 UTC 2016
Author: jbeich
Date: Sun May 22 01:10:54 2016
New Revision: 415616
URL: https://svnweb.freebsd.org/changeset/ports/415616
Log:
devel/fb-adb: back out r415434 and r415502
Better fix will follow. r415502 also broke 9.x:
===> Extracting for fb-adb-1.4.4.124
=> SHA256 Checksum OK for android-ndk-r10e-linux-x86.bin.
=> SHA256 Checksum OK for facebook-fb-adb-1.4.4-124-gb230619_GH0.tar.gz.
tar: Unrecognized archive format
tar: Error exit delayed from previous errors.
*** [do-extract] Error code 1
Reported by: pkg-fallout
Modified:
head/devel/fb-adb/Makefile (contents, props changed)
Modified: head/devel/fb-adb/Makefile
==============================================================================
--- head/devel/fb-adb/Makefile Sun May 22 01:10:34 2016 (r415615)
+++ head/devel/fb-adb/Makefile Sun May 22 01:10:54 2016 (r415616)
@@ -54,19 +54,18 @@ NDK_MASTER_SITES= https://dl.google.com/
# Prefer NDK from environment
WRKSRC_ndk= ${ANDROID_NDK}
.else
-NDK_DISTFILES= ${DISTNAME_ndk}.bin:ndk
+NDK_DISTFILES= ${DISTNAME_ndk}.bin:ndk,p7zip
DISTNAME_ndk= android-ndk-r10e-linux-${LINUX_RPM_ARCH:C/i.86/x86/}
-EXTRACT_ONLY= ${DISTFILES:N${EXTRACT_ONLY_7z}*}
-EXTRACT_ONLY_7z= ${DISTNAME_ndk}.bin
WRKSRC_ndk= ${WRKDIR}/${DISTNAME_ndk:C/(-[^-]+){2}$//}
.endif
NDK_BUILD_DEPENDS= ${LINUX_BASE_PORT}
-NDK_USES= 7z:partial,p7zip
+NDK_USES= 7z:partial${NDK_7z_ARGS_${LINUX_RPM_ARCH}}
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)
More information about the svn-ports-head
mailing list