From owner-svn-ports-head@freebsd.org Thu May 19 16:18:15 2016 Return-Path: Delivered-To: svn-ports-head@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 7830FB4223F for ; Thu, 19 May 2016 16:18:15 +0000 (UTC) (envelope-from jbeich@freebsd.org) Received: from vfemail.net (onethreetwo.vfemail.net [199.16.11.132]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1907413A5 for ; Thu, 19 May 2016 16:18:14 +0000 (UTC) (envelope-from jbeich@freebsd.org) Received: (qmail 21764 invoked by uid 89); 19 May 2016 16:18:07 -0000 Received: from localhost (HELO freequeue.vfemail.net) (127.0.0.1) by localhost with (DHE-RSA-AES256-SHA encrypted) SMTP; 19 May 2016 16:18:07 -0000 Received: (qmail 21740 invoked by uid 89); 19 May 2016 16:17:50 -0000 Received: by simscan 1.3.1 ppid: 21732, pid: 21736, t: 0.0045s scanners:none Received: from unknown (HELO smtp102-2.vfemail.net) (172.16.100.62) by FreeQueue with SMTP; 19 May 2016 16:17:50 -0000 Received: (qmail 4176 invoked by uid 89); 19 May 2016 16:17:50 -0000 Received: by simscan 1.4.0 ppid: 4134, pid: 4169, t: 1.4010s scanners:none Received: from unknown (HELO nil) (amJlaWNoQHZmZW1haWwubmV0@172.16.100.27) by mail.vfemail.net with ESMTPA; 19 May 2016 16:17:48 -0000 From: Jan Beich To: Mathieu Arnold Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r415502 - head/devel/fb-adb References: <201605191106.u4JB6CcI020057@repo.freebsd.org> Date: Thu, 19 May 2016 18:17:33 +0200 In-Reply-To: <201605191106.u4JB6CcI020057@repo.freebsd.org> (Mathieu Arnold's message of "Thu, 19 May 2016 11:06:12 +0000 (UTC)") Message-ID: <1t4y-owde-wny@vfemail.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 May 2016 16:18:15 -0000 --=-=-= Content-Type: text/plain Mathieu Arnold 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) --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQF8BAEBCgBmBQJXPecdXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXREQjQ0MzY3NEM3RDIzNTc4NkUxNDkyQ0VF NEM3Nzg4MzQ3OURCRERCAAoJEOTHeINHnb3bjEIH/jU+lculJy/9McyqKE/5jod5 SftMlC6tLh64gnK4sbFUPL7A9wQOWWQHoo9zflvHhIz9EpWIvv6J5ivcsz+bAewW SOz2KGT7faPzVMR5gqx2TZqsW51uiWYw2MLE/LH5AOBqL6Bs1kDJAxKPMMFmshFu GatS7aCAk1JfklWFSMEwJLBax226kJWt5M2ZsgqmlF20vkbTYCBuWwKOx1OuP3XQ KDR7dNtyfZepRp9yjy3oa6ft6bZeyOpqmJjh9GQ7YMNDRzm6q6uRVJ1IDTYqoXM8 pHgKVS1Tc4BjFie7pujPBgeLptuPZe/89ykFYcnliQCjgMF4uO04KCMPNMkIXq8= =M27j -----END PGP SIGNATURE----- --=-=-=--