Attachment 182647 Details for Bug 218976 – Add NO_ARCH=yes for USES=cran (without :compiles) [v1.1.0]

[patch] Add NO_ARCH=yes for USES=cran (without :compiles) [v1.1.0]

cran.patch (text/plain), 2.25 KB, created by David Naylor on 2017-05-16 19:20:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Naylor

Created: 2017-05-16 19:20:15 UTC

Size: 2.25 KB

patch

obsolete

>diff --git a/Mk/Scripts/qa.sh b/Mk/Scripts/qa.sh
>index 024fce7e8fa7..fbd4bc0196b6 100644
>--- a/Mk/Scripts/qa.sh
>+++ b/Mk/Scripts/qa.sh
>@@ -797,9 +797,25 @@ perlcore() {
> 	fi
> }
> 
>+no_arch() {
>+	[ -z "$NO_ARCH" ] && return 0
>+	rc=0
>+	while read f; do
>+		err "$f is a architecture specific binary file and you have NO_ARCH=$NO_ARCH set"
>+		rc=1
>+	done <<-EOF
>+	$(find ${STAGEDIR}${PREFIX} -type f \
>+		| xargs file -i \
>+		| grep -E 'application/x-(executable|object|sharedlib); charset=binary' \
>+		| cut -f 1 -d :)
>+	EOF
>+	return $rc
>+}
>+
>+
> checks="shebang symlinks paths stripped desktopfileutils sharedmimeinfo"
> checks="$checks suidfiles libtool libperl prefixvar baselibs terminfo"
>-checks="$checks proxydeps sonames perlcore"
>+checks="$checks proxydeps sonames perlcore no_arch"
> 
> ret=0
> cd ${STAGEDIR}
>diff --git a/Mk/Uses/cran.mk b/Mk/Uses/cran.mk
>index b23d91989654..28c08f717e0c 100644
>--- a/Mk/Uses/cran.mk
>+++ b/Mk/Uses/cran.mk
>@@ -71,6 +71,8 @@ cran-strip:
> 	${FIND} ${STAGEDIR}${PREFIX}/${R_MOD_DIR} -name '*.so' -exec ${STRIP_CMD} {} +
> .include "${PORTSDIR}/math/R/compiler.mk"
> .include "${USESDIR}/fortran.mk"
>+.else
>+NO_ARCH=	yes
> .endif
> 
> .endif #_INCLUDE_USES_CRAN_MK
>diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
>index 52bbdf1c1387..05c4326e5d71 100644
>--- a/Mk/bsd.port.mk
>+++ b/Mk/bsd.port.mk
>@@ -1527,7 +1527,8 @@ QA_ENV+=		STAGEDIR=${STAGEDIR} \
> 				PKGORIGIN=${PKGORIGIN} \
> 				LIB_RUN_DEPENDS='${_LIB_RUN_DEPENDS:C,[^:]*:([^:]*):?.*,\1,}' \
> 				UNIFIED_DEPENDS=${_UNIFIED_DEPENDS:C,([^:]*:[^:]*):?.*,\1,:O:u:Q} \
>-				PKGBASE=${PKGBASE}
>+				PKGBASE=${PKGBASE} \
>+				NO_ARCH=${NO_ARCH}
> .if !empty(USES:Mssl)
> QA_ENV+=		USESSSL=yes
> .endif
>diff --git a/math/R-cran-car/Makefile b/math/R-cran-car/Makefile
>index de2b6fcd3179..e4b80dc8c613 100644
>--- a/math/R-cran-car/Makefile
>+++ b/math/R-cran-car/Makefile
>@@ -23,6 +23,4 @@ TEST_DEPENDS=	R-cran-lmtest>0:finance/R-cran-lmtest \
> 
> USES=		cran:auto-plist
> 
>-NO_ARCH=	yes
>-
> .include <bsd.port.mk>
>diff --git a/textproc/R-cran-R2HTML/Makefile b/textproc/R-cran-R2HTML/Makefile
>index dd62884b9f89..d51bf4da034c 100644
>--- a/textproc/R-cran-R2HTML/Makefile
>+++ b/textproc/R-cran-R2HTML/Makefile
>@@ -13,6 +13,5 @@ COMMENT=	HTML exportation for R objects
> LICENSE=	GPLv2
> 
> USES=		cran
>-NO_ARCH=	yes
> 
> .include <bsd.port.mk>

Actions: View | Diff

Attachments on bug 218976: 182193 | 182647 | 182714 | 182834 | 182973 | 183393