From owner-svn-ports-all@freebsd.org Thu May 19 11:05:22 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 427BEB42810; Thu, 19 May 2016 11:05:22 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from prod2.absolight.net (mx3.absolight.net [IPv6:2a01:678:2:100::25]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "plouf.absolight.net", Issuer "CAcert Class 3 Root" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id D9BE21F39; Thu, 19 May 2016 11:05:21 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from prod2.absolight.net (localhost [127.0.0.1]) by prod2.absolight.net (Postfix) with ESMTP id AD665BDCC1; Thu, 19 May 2016 13:05:19 +0200 (CEST) Received: from gw.in.absolight.net (gw-ecl.in.absolight.net [79.143.241.69]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "gw.in.absolight.net", Issuer "CA Cert Signing Authority" (not verified)) by prod2.absolight.net (Postfix) with ESMTPSA id 75021BDC8D; Thu, 19 May 2016 13:05:19 +0200 (CEST) Received: from ogg.in.absolight.net (ogg.in.absolight.net [79.143.241.239]) by gw.in.absolight.net (Postfix) with ESMTP id 3EA5E6142; Thu, 19 May 2016 13:05:18 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by ogg.in.absolight.net (Postfix) with ESMTP id 572FF28E8B67; Thu, 19 May 2016 13:05:17 +0200 (CEST) Date: Thu, 19 May 2016 13:05:16 +0200 From: Mathieu Arnold To: Jan Beich cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r415434 - head/devel/fb-adb Message-ID: In-Reply-To: <1t4z-v1uf-wny@vfemail.net> References: <201605181156.u4IBuseK058800@repo.freebsd.org> <1t4z-v1uf-wny@vfemail.net> X-Mailer: Mulberry/4.0.8 (Mac OS X) MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="==========3D546D4C66D434B97366==========" X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 May 2016 11:05:22 -0000 --==========3D546D4C66D434B97366========== Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Content-Disposition: inline +--On 18 mai 2016 17:10:32 +0200 Jan Beich wrote: | Mathieu Arnold 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 --==========3D546D4C66D434B97366========== Content-Type: application/pgp-signature Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQJ8BAEBCgBmBQJXPZ3tXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzQUI2OTc4OUQyRUQxMjEwNjQ0MEJBNUIz QTQ1MTZGMzUxODNDRTQ4AAoJEDpFFvNRg85IsZwQAInl059fxX0XnuDbT7u9j8wV aFNHe3hXraiXtI+DiBM2B8bL7Xldbfj/Cnlt/hur6X71h/W1+nNXMN/bWmsEzOQh ZTb3U/lIdPUiDtqw+6ZBS9+aKrCQX/yehKOuS197SbFW0wOLZnEVgu1HuHY0MukX uWBQwJILV4x55j2Dk0y0djxlhURsNiuxFOayj/LoNWgskENbA6ftvi6dyaE5z3Fb M3z0grPTZSv373gdWZ+oexyTxm09hkIRLD/zbZfIscFVG5nBJoyprIySlwBNDh7i pt66W8BeQpuIIzc5EkSudTlgQ9FnFZLgFJta9zkOgrTzEj4TrZ41y9qmwkMj1Ft7 +z4XOOfQ0a9F3RXl7SdydHIq1UF87OpEHJkzeLoDiGCRDtAs4nY7KFjOAdGqNDyX I60yIOml7GZxm8kU2APC/sIpo8URQsnDQOqa1hqdX33RVEijOwNPHz6dtU5bG5nj nwRNQXEFgBcr7+G/xJsJd3jm+YkJuIaZxbHt1YeVudor19W+8IlUhfUf347qONLW 3ggIVmV1MSVPWR2yd/oQen7hhnKcstnTNyLdJTzHvkBCH3VNbrNy2Y2/Nx/rf8le D3rjBCKnmv6QC5rPSqkF4yJZTrs15+8agU51ggBXlpDMAoa7qUB3jRhNGKUqS0uw 6aC310u/nYOUHht8bcAG =pMMd -----END PGP SIGNATURE----- --==========3D546D4C66D434B97366==========--