svn commit: r415434 - head/devel/fb-adb

[Jan Beich]

Mathieu Arnold <mat at FreeBSD.org> writes:

> Author: mat
> Date: Wed May 18 11:56:53 2016
> New Revision: 415434
> URL: https://svnweb.freebsd.org/changeset/ports/415434
>
> Log:
>   Remove unused group.
>   
>   PR:		208916
>   Sponsored by:	Absolight
>
> Modified:
>   head/devel/fb-adb/Makefile
>
> Modified: head/devel/fb-adb/Makefile
> ==============================================================================
> --- head/devel/fb-adb/Makefile	Wed May 18 11:28:42 2016	(r415433)
> +++ head/devel/fb-adb/Makefile	Wed May 18 11:56:53 2016	(r415434)
> @@ -54,7 +54,7 @@ NDK_MASTER_SITES=	https://dl.google.com/
>  # Prefer NDK from environment
>  WRKSRC_ndk=		${ANDROID_NDK}
>  .else
> -NDK_DISTFILES=		${DISTNAME_ndk}.bin:ndk,p7zip
> +NDK_DISTFILES=		${DISTNAME_ndk}.bin:ndk
>  DISTNAME_ndk=		android-ndk-r10e-linux-${LINUX_RPM_ARCH:C/i.86/x86/}
>  WRKSRC_ndk=		${WRKDIR}/${DISTNAME_ndk:C/(-[^-]+){2}$//}
>  .endif

I disagree with the fix. Either put :p7zip in MASTER_SITES as well or
use EXTRACT_ONLY{,_7z} directly. LINUX_RPM_ARCH=x86_64 distfile fails to
extract with bsdtar(1), so :p7zip group limits USES=7z:partial,p7zip to
the specific file. For details, see do-p7zip-extract implementation.

  $ OVERRIDE_LINUX_BASE_PORT=c6_64 make extract -C devel/fb-adb
  ===>  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

Actually, r415434 only exacerbates regression from r411857. v0 fix for
both that tries to keep the code simple follows.

Index: devel/fb-adb/Makefile
===================================================================
--- devel/fb-adb/Makefile	(revision 415453)
+++ devel/fb-adb/Makefile	(working copy)
@@ -49,23 +49,23 @@ DEBUG_CONFIGURE_ENABLE=	debuggable-stubs
 
 # XXX Convert into USES=android once more things depend on it
 NDK_DESC=		Build target stubs using Android NDK
-NDK_MASTER_SITES=	https://dl.google.com/android/ndk/:ndk
+NDK_MASTER_SITES=	https://dl.google.com/android/ndk/:ndk,p7zip
 .if defined(ANDROID_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/}
 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${NDK_7z_ARGS_${OVERRIDE_LINUX_BASE_PORT}}
 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_7z_ARGS_c6_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)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 602 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-ports-head/attachments/20160518/ceb4d6d4/attachment.sig>