Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 13 Jan 2020 10:25:47 +0000 (UTC)
From:      Piotr Kubaj <pkubaj@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r522875 - head/sysutils/sformat
Message-ID:  <202001131025.00DAPlbI019799@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pkubaj
Date: Mon Jan 13 10:25:47 2020
New Revision: 522875
URL: https://svnweb.freebsd.org/changeset/ports/522875

Log:
  sysutils/sformat: fix build on powerpc64
  
  Makefile uses uname -m (which returns powerpc on powerpc64) instead of uname -p (which correctly returns powerpc64).
  
  PR:		243152
  Approved by:	marius (maintainer)
  MFH:		2020Q1 (fix build blanket)

Modified:
  head/sysutils/sformat/Makefile

Modified: head/sysutils/sformat/Makefile
==============================================================================
--- head/sysutils/sformat/Makefile	Mon Jan 13 10:13:15 2020	(r522874)
+++ head/sysutils/sformat/Makefile	Mon Jan 13 10:25:47 2020	(r522875)
@@ -14,12 +14,6 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	marius@FreeBSD.org
 COMMENT=	Allows formatting/partitioning/analysis/repairing of SCSI disks
 
-BROKEN_aarch64=		does not build: No rule to make target RULES/arm64-freebsd-cc.rul
-BROKEN_armv6=		does not build: No rule to make target RULES/arm-freebsd-cc.rul
-BROKEN_armv7=		does not build: No rule to make target RULES/arm-freebsd-cc.rul
-BROKEN_mips64=		does not build: No rule to make target RULES/mips-freebsd-cc.rul
-BROKEN_powerpc64=	does not install: powerpc-freebsd-cc/sformat: No such file or directory
-
 LIBSCHILY=	libschily-2.01.01a07.tar.gz
 USES=		gmake
 
@@ -27,7 +21,8 @@ USES=		gmake
 
 CCOM!=		${BASENAME} ${CC}
 MAKE_ENV+=	CCOM=${CCOM}
-SFMTTARGET=	${ARCH:S/powerpc64/powerpc/}-freebsd-${CCOM}
+SFMTTARGET=	${ARCH}-freebsd-${CCOM}
+SFMTXARCH!=	${UNAME} -m
 
 post-extract:
 	@cd ${WRKSRC} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
@@ -37,7 +32,7 @@ post-extract:
 .endfor
 .if ${SFMTTARGET} != "i386-freebsd-cc"
 	@${LN} -sf ${WRKSRC}/RULES/i386-freebsd-cc.rul \
-		${WRKSRC}/RULES/${SFMTTARGET}.rul
+		${WRKSRC}/RULES/${SFMTXARCH}-${OPSYS:tl}-cc.rul
 .endif
 
 post-patch:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202001131025.00DAPlbI019799>