From owner-svn-ports-head@freebsd.org Fri Mar 25 15:39:32 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 79F1AADD243; Fri, 25 Mar 2016 15:39:32 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 315281A09; Fri, 25 Mar 2016 15:39:32 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2PFdVMd093045; Fri, 25 Mar 2016 15:39:31 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2PFdVx5093044; Fri, 25 Mar 2016 15:39:31 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201603251539.u2PFdVx5093044@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 25 Mar 2016 15:39:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r411857 - head/devel/fb-adb X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.21 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: Fri, 25 Mar 2016 15:39:32 -0000 Author: jbeich Date: Fri Mar 25 15:39:31 2016 New Revision: 411857 URL: https://svnweb.freebsd.org/changeset/ports/411857 Log: devel/fb-adb: convert to USES=7z:partial Differential Revision: https://reviews.freebsd.org/D4190 Modified: head/devel/fb-adb/Makefile (contents, props changed) Modified: head/devel/fb-adb/Makefile ============================================================================== --- head/devel/fb-adb/Makefile Fri Mar 25 15:38:56 2016 (r411856) +++ head/devel/fb-adb/Makefile Fri Mar 25 15:39:31 2016 (r411857) @@ -62,11 +62,13 @@ DISTNAME_ndk= android-ndk-r10e-linux-${ WRKSRC_ndk= ${WRKDIR}/${DISTNAME_ndk:C/(-[^-]+){2}$//} .endif NDK_BUILD_DEPENDS= ${LINUX_BASE_PORT} +NDK_USES= 7z:partial${NDK_7z_ARGS_${LINUX_RPM_ARCH}} 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_x86_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) @@ -109,27 +111,6 @@ do-autoreconf: @${MKDIR} ${CONFIGURE_WRKSRC} .endif -.include - -# XXX D4190: Extract :p7zip files with 7z(1) if libarchive cannot handle -# x86_64 self-extracting archive or is too old to have 7zip reader -.if defined(OVERRIDE_LINUX_BASE_PORT) || \ - (${OPSYS} == FreeBSD && ${OSVERSION} < 1000009) -EXTRACT_ONLY+= ${DISTFILES:N*\:*p7zip*:C/:.*//} -EXTRACT_DEPENDS+=${P7ZIP_CMD}:archivers/p7zip - -P7ZIP_CMD?= 7z -P7ZIP_ARGS?= x -bd -y -o${WRKDIR} >/dev/null - -_OPTIONS_extract+= 520:do-p7zip-extract -do-p7zip-extract: - @for f in ${DISTFILES:M*\:*p7zip*:C/:.*//}; do \ - if ! ${P7ZIP_CMD} ${P7ZIP_ARGS} ${_DISTDIR}/$$f; then \ - return 1; \ - fi; \ - done -.endif - .include # XXX Bug 204615: Teach USE_LINUX about build-only deps