diff options
| author | jbeich <jbeich@FreeBSD.org> | 2016-05-22 09:10:54 +0800 |
|---|---|---|
| committer | jbeich <jbeich@FreeBSD.org> | 2016-05-22 09:10:54 +0800 |
| commit | 940ae4729106a0b75def1f3888454b451382bcc0 (patch) | |
| tree | 8ec44d83697b6949e153bcf5ca48645aace4c972 /devel/fb-adb | |
| parent | 49366e8dab54dc497d5671e3ca9e46517442819e (diff) | |
| download | freebsd-ports-gnome-940ae4729106a0b75def1f3888454b451382bcc0.tar.gz freebsd-ports-gnome-940ae4729106a0b75def1f3888454b451382bcc0.tar.zst freebsd-ports-gnome-940ae4729106a0b75def1f3888454b451382bcc0.zip | |
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
Diffstat (limited to 'devel/fb-adb')
| -rw-r--r-- | devel/fb-adb/Makefile | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/devel/fb-adb/Makefile b/devel/fb-adb/Makefile index e5a000af46d9..77a414dbb27d 100644 --- a/devel/fb-adb/Makefile +++ b/devel/fb-adb/Makefile @@ -54,19 +54,18 @@ NDK_MASTER_SITES= https://dl.google.com/android/ndk/:ndk # 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) |