Date: Wed, 18 May 2016 17:10:32 +0200 From: Jan Beich <jbeich@FreeBSD.org> To: Mathieu Arnold <mat@FreeBSD.org> 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: <1t4z-v1uf-wny@vfemail.net> In-Reply-To: <201605181156.u4IBuseK058800@repo.freebsd.org> (Mathieu Arnold's message of "Wed, 18 May 2016 11:56:54 %2B0000 (UTC)") References: <201605181156.u4IBuseK058800@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Mathieu Arnold <mat@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. >=20=20=20 > PR: 208916 > Sponsored by: Absolight > > Modified: > head/devel/fb-adb/Makefile > > Modified: head/devel/fb-adb/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- 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=3D https://dl.google.com/ > # Prefer NDK from environment > WRKSRC_ndk=3D ${ANDROID_NDK} > .else > -NDK_DISTFILES=3D ${DISTNAME_ndk}.bin:ndk,p7zip > +NDK_DISTFILES=3D ${DISTNAME_ndk}.bin:ndk > DISTNAME_ndk=3D android-ndk-r10e-linux-${LINUX_RPM_ARCH:C/i.86/x86/} > WRKSRC_ndk=3D ${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=3Dx86_64 distfile fails to extract with bsdtar(1), so :p7zip group limits USES=3D7z:partial,p7zip to the specific file. For details, see do-p7zip-extract implementation. $ OVERRIDE_LINUX_BASE_PORT=3Dc6_64 make extract -C devel/fb-adb =3D=3D=3D> Extracting for fb-adb-1.4.4.124 =3D> SHA256 Checksum OK for android-ndk-r10e-linux-x86_64.bin. =3D> 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 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =2D-- devel/fb-adb/Makefile (revision 415453) +++ devel/fb-adb/Makefile (working copy) @@ -49,23 +49,23 @@ DEBUG_CONFIGURE_ENABLE=3D debuggable-stubs =20 # XXX Convert into USES=3Dandroid once more things depend on it NDK_DESC=3D Build target stubs using Android NDK =2DNDK_MASTER_SITES=3D https://dl.google.com/android/ndk/:ndk +NDK_MASTER_SITES=3D https://dl.google.com/android/ndk/:ndk,p7zip .if defined(ANDROID_NDK) # Prefer NDK from environment WRKSRC_ndk=3D ${ANDROID_NDK} .else =2DNDK_DISTFILES=3D ${DISTNAME_ndk}.bin:ndk +NDK_DISTFILES=3D ${DISTNAME_ndk}.bin:ndk,p7zip DISTNAME_ndk=3D android-ndk-r10e-linux-${LINUX_RPM_ARCH:C/i.86/x86/} WRKSRC_ndk=3D ${WRKDIR}/${DISTNAME_ndk:C/(-[^-]+){2}$//} .endif NDK_BUILD_DEPENDS=3D ${LINUX_BASE_PORT} =2DNDK_USES=3D 7z:partial${NDK_7z_ARGS_${LINUX_RPM_ARCH}} +NDK_USES=3D 7z:partial${NDK_7z_ARGS_${OVERRIDE_LINUX_BASE_PORT}} NDK_USE=3D LINUX=3Dyes # build NDK_SHELL=3D ${SETENV} UNAME_s=3DLinux UNAME_m=3D${LINUX_RPM_ARCH} ${SH} NDK_CONFIGURE_ENV=3D ANDROID_NDK=3D"${WRKSRC_ndk}" \ ANDROID_NDK_SHELL=3D"${NDK_SHELL}" \ NDK_TMPDIR=3D"${WRKDIR}" =2DNDK_7z_ARGS_x86_64=3D ,p7zip # libarchive fails to read +NDK_7z_ARGS_c6_64=3D ,p7zip # libarchive fails to read NDK_BUILD_DEPENDS_OFF=3D ${LOCALBASE}/android/ARMv7/bin/arm-aux-linux-andr= oideabi-gcc:lang/gnatdroid-armv7 \ ${LOCALBASE}/android-x86/x86_32/bin/i686-aux-linux-android-gcc:lang/gna= tdroid-x86 .if defined(.PARSEDIR) --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQF8BAEBCgBmBQJXPIXoXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXREQjQ0MzY3NEM3RDIzNTc4NkUxNDkyQ0VF NEM3Nzg4MzQ3OURCRERCAAoJEOTHeINHnb3b8+YH/2k7GHhpcDdiMVyTPBj5cuVN ufH1p2jCOU76wBgIgQLqXMiH64TNKUH35k0tIcKvJngUWUIL/+vEvW+Vu2doFhRD r6u59YuWlwH4s0Zvij+sMDj6GcWLc3LG++zheKoA2uvrobp/RYx0Y8GoSbb1uq1R v+H6kkZQsROKol0W9TfPalcv6uiTwhUiwqlDtc1BqzBMcbscdqICW7hrcuiWh0IC Lw2ji7vlJ8nsF5hYu12ahaExM/ADmkQQ+7kkyQUaQMv/pbeLhhzwT8NPJdbY/Xkk I0CDLG4f0hvPxcqZ9+Rz0YvWhuRYI6h3gNEmHGytWAa3QfzDqv8hCk1BynWUys0= =r/PS -----END PGP SIGNATURE----- --=-=-=--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1t4z-v1uf-wny>