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

[Mathieu Arnold]

+--On 18 mai 2016 17:10:32 +0200 Jan Beich <jbeich at FreeBSD.org> wrote:
| 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.
| 

Ok, so, I tested the code before my change:

$ OVERRIDE_LINUX_BASE_PORT=c6_64 make -V EXTRACT_ONLY -V EXTRACT_ONLY_7z -V
NDK_USES -V 7z_ARGS
android-ndk-r10e-linux-x86_64.bin
facebook-fb-adb-1.4.4-124-gb230619_GH0.tar.gz

7z:partial,p7zip
partial
$ make -V EXTRACT_ONLY -V EXTRACT_ONLY_7z -V NDK_USES -V 7z_ARGS
android-ndk-r10e-linux-x86.bin facebook-fb-adb-1.4.4-124-gb230619_GH0.tar.gz

7z:partial
partial

Turns out, it did not set the p7zip bit in the 7z arguments, the linux bits
must be handeled later.

I'll commit an always working version.

-- 
Mathieu Arnold
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 949 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-ports-head/attachments/20160519/87e9ca50/attachment-0001.sig>