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

[Jan Beich]

Mathieu Arnold <mat at FreeBSD.org> writes:

> Modified: head/devel/fb-adb/Makefile
> ==============================================================================
> --- head/devel/fb-adb/Makefile	Thu May 19 10:57:35 2016	(r415501)
> +++ head/devel/fb-adb/Makefile	Thu May 19 11:06:12 2016	(r415502)
> @@ -56,16 +56,17 @@ WRKSRC_ndk=		${ANDROID_NDK}
>  .else
>  NDK_DISTFILES=		${DISTNAME_ndk}.bin:ndk
>  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

:N${FOO} syntax doesn't work with fmake i.e., on FreeBSD 9.x. Notice the port
already handles similar case via .if defined(.PARSEDIR) conditional at the end.

$ make -V EXTRACT_ONLY
facebook-fb-adb-1.4.4-124-gb230619_GH0.tar.gz
$ fmake -V EXTRACT_ONLY
android-ndk-r10e-linux-x86.bin:ndk facebook-fb-adb-1.4.4-124-gb230619_GH0.tar.gz*}

>  NDK_BUILD_DEPENDS=	${LINUX_BASE_PORT}
> -NDK_USES=		7z:partial${NDK_7z_ARGS_${LINUX_RPM_ARCH}}
> +NDK_USES=		7z:partial,p7zip

Why unconditionally? If you didn't like my previous fix here's another one.
Note, USES=7z semantic overloading isn't new, [:-pX] in PATCHFILES and
EXTRA_PATCHES also "abuse nonexisting groups".

Index: devel/fb-adb/Makefile
===================================================================
--- devel/fb-adb/Makefile	(revision 415508)
+++ devel/fb-adb/Makefile	(working copy)
@@ -56,17 +56,18 @@ WRKSRC_ndk=		${ANDROID_NDK}
 .else
 NDK_DISTFILES=		${DISTNAME_ndk}.bin:ndk
 DISTNAME_ndk=		android-ndk-r10e-linux-${LINUX_RPM_ARCH:C/i.86/x86/}
-EXTRACT_ONLY=		${DISTFILES:N${EXTRACT_ONLY_7z}*}
+NDK_EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 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_${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_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/20160519/b9b4240a/attachment.sig>