From 978119d7786bffa78a2b74d059070457c0437949 Mon Sep 17 00:00:00 2001 From: Piotr Kubaj Date: Tue, 30 Apr 2019 13:42:17 +0000 Subject: benchmarks/libmicro: fix build on powerpc64 libmicro names files with -powerpc suffix, not powerpc64. Set and use LIBMICRO_ARCH instead of ARCH. Approved by: mat (mentor) Differential Revision: https://reviews.freebsd.org/D19956 --- benchmarks/libmicro/Makefile | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'benchmarks') diff --git a/benchmarks/libmicro/Makefile b/benchmarks/libmicro/Makefile index eaa8f2f174b2..3435a6fe15c9 100644 --- a/benchmarks/libmicro/Makefile +++ b/benchmarks/libmicro/Makefile @@ -15,14 +15,15 @@ BROKEN_aarch64= Fails to build: bin-aarch64: no such file or directory BROKEN_armv6= Fails to build: bin-armv6: no such file or directory BROKEN_armv7= Fails to build: bin-armv7: no such file or directory BROKEN_mips64= Fails to build: bin-mips64: no such file or directory -BROKEN_powerpc64= Fails to build: bin-powerpc64: no such file or directory USES= gmake WRKSRC= ${WRKDIR}/libMicro-${PORTVERSION} STRIP= # Do not strip binaries -PLIST_SUB= ARCH="${ARCH}" +PLIST_SUB= ARCH="${LIBMICRO_ARCH}" PKGLIBDIR= ${PREFIX}/lib/${PORTNAME} +LIBMICRO_ARCH= ${ARCH:S/powerpc64/powerpc/} + post-build: ${ECHO_CMD} '#!/bin/sh' > ${WRKDIR}/libmicro-bench ${ECHO_CMD} '(cd ${PKGLIBDIR} && ./bench $$1)' \ @@ -36,13 +37,13 @@ do-install: @${MKDIR} ${STAGEDIR}${PKGLIBDIR} (cd ${WRKSRC} && ${INSTALL_SCRIPT} bench.sh \ ${STAGEDIR}${PKGLIBDIR}/bench) - @${MKDIR} ${STAGEDIR}${PKGLIBDIR}/bin-${ARCH} - (cd ${WRKSRC}/bin-${ARCH} \ - && ${INSTALL_PROGRAM} exec_bin ${STAGEDIR}${PKGLIBDIR}/bin-${ARCH}) + @${MKDIR} ${STAGEDIR}${PKGLIBDIR}/bin-${LIBMICRO_ARCH} + (cd ${WRKSRC}/bin-${LIBMICRO_ARCH} \ + && ${INSTALL_PROGRAM} exec_bin ${STAGEDIR}${PKGLIBDIR}/bin-${LIBMICRO_ARCH}) (cd ${WRKSRC}/bin ; for i in * ; do ${INSTALL_PROGRAM} \ - ${WRKSRC}/bin-${ARCH}/$$i ${STAGEDIR}${PKGLIBDIR}/bin-${ARCH} ; done) + ${WRKSRC}/bin-${LIBMICRO_ARCH}/$$i ${STAGEDIR}${PKGLIBDIR}/bin-${LIBMICRO_ARCH} ; done) @${MKDIR} ${STAGEDIR}${PKGLIBDIR}/bin - (cd ${STAGEDIR}${PKGLIBDIR}/bin-${ARCH} ; for i in * ; do ${LN} -s \ - ../bin-${ARCH}/$$i ../bin ; done) + (cd ${STAGEDIR}${PKGLIBDIR}/bin-${LIBMICRO_ARCH} ; for i in * ; do ${LN} -s \ + ../bin-${LIBMICRO_ARCH}/$$i ../bin ; done) .include -- cgit v1.2.3