Date: Thu, 8 Dec 2016 13:46:15 +0000 (UTC) From: Tijl Coosemans <tijl@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r428117 - head/Mk/Uses Message-ID: <201612081346.uB8DkF8X073150@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tijl Date: Thu Dec 8 13:46:15 2016 New Revision: 428117 URL: https://svnweb.freebsd.org/changeset/ports/428117 Log: Simplify USES=linux do-install and add support for architecture specific distfiles. Modified: head/Mk/Uses/linux.mk Modified: head/Mk/Uses/linux.mk ============================================================================== --- head/Mk/Uses/linux.mk Thu Dec 8 13:32:59 2016 (r428116) +++ head/Mk/Uses/linux.mk Thu Dec 8 13:46:15 2016 (r428117) @@ -303,12 +303,28 @@ PLIST?= ${PKGDIR}/pkg-plist.${LINUX_AR .if !target(do-install) do-install: - (cd ${WRKSRC} && ${FIND} * -type d -exec ${MKDIR} "${STAGEDIR}${PREFIX}/{}" \;) - (cd ${WRKSRC} && ${FIND} * ! -type d | ${CPIO} -pm ${STAGEDIR}${PREFIX}) + (cd ${WRKSRC} && ${FIND} * | ${CPIO} -dumpl ${STAGEDIR}${PREFIX}) .endif .endif # USE_LINUX_RPM +.ifdef DISTNAME_i386 +DISTFILES_i386?= ${DISTNAME_i386}${EXTRACT_SUFX} +.endif +.ifdef DISTNAME_x86_64 +DISTFILES_x86_64?= ${DISTNAME_x86_64}${EXTRACT_SUFX} +.endif +.ifdef DISTFILES_i386 || DISTFILES_x86_64 +.if make(makesum) +.if !defined(DISTFILES) +DISTFILES= ${DISTFILES_i386} ${DISTFILES_x86_64} +EXTRACT_ONLY?= ${DISTFILES_${LINUX_ARCH}} +.endif +.else +DISTFILES?= ${DISTFILES_${LINUX_ARCH}} +.endif +.endif + # With fmake :M${var} only works when ${var} is a for loop variable. .for fmakehack in ${LINUX_ARCH:S/x86_64/amd64/} .if (defined(ONLY_FOR_ARCHS) && empty(ONLY_FOR_ARCHS:M${fmakehack})) \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201612081346.uB8DkF8X073150>