Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 8 Jan 2021 21:52:22 +0000 (UTC)
From:      Mark Linimon <linimon@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r560812 - head/devel/hwloc2
Message-ID:  <202101082152.108LqMbX041495@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: linimon
Date: Fri Jan  8 21:52:22 2021
New Revision: 560812
URL: https://svnweb.freebsd.org/changeset/ports/560812

Log:
  Fix plist on non-x86 systems:
  
    pkg-static: Unable to access file /wrkdirs/usr/ports/devel/hwloc2/work/stage/usr/local/bin/hwloc-gather-cpuid:No such file or directory
    pkg-static: Unable to access file /wrkdirs/usr/ports/devel/hwloc2/work/stage/usr/local/man/man1/hwloc-gather-cpuid.1.gz:No such file or directory
  
  From file doc/hwloc.doxy:
  
    hwloc-dump-hwdata is a Linux and x86-specific tool that dumps
    (during boot, privileged) some topology and locality information
    from raw hardware files (SMBIOS and ACPI tables) to human-readable
    and world-accessible files that the hwloc library will later reuse.
    See \ref faq_knl_dump.
  
  Approved by:	portmgr (tier-2 blanket)

Modified:
  head/devel/hwloc2/Makefile
  head/devel/hwloc2/pkg-plist

Modified: head/devel/hwloc2/Makefile
==============================================================================
--- head/devel/hwloc2/Makefile	Fri Jan  8 20:46:17 2021	(r560811)
+++ head/devel/hwloc2/Makefile	Fri Jan  8 21:52:22 2021	(r560812)
@@ -43,8 +43,16 @@ CAIRO_LIB_DEPENDS=	libcairo.so:graphics/cairo
 CAIRO_USES=		xorg
 CAIRO_USE=		XORG=x11
 
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} != amd64 && ${ARCH} != i386
+PLIST_SUB=	X86="@comment "
+.else
+PLIST_SUB=	X86=""
+.endif
+
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/html
 	${INSTALL_DATA} ${WRKSRC}/doc/doxygen-doc/html/* ${STAGEDIR}${DOCSDIR}/html/
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

Modified: head/devel/hwloc2/pkg-plist
==============================================================================
--- head/devel/hwloc2/pkg-plist	Fri Jan  8 20:46:17 2021	(r560811)
+++ head/devel/hwloc2/pkg-plist	Fri Jan  8 21:52:22 2021	(r560812)
@@ -4,7 +4,7 @@ bin/hwloc-calc
 bin/hwloc-compress-dir
 bin/hwloc-diff
 bin/hwloc-distrib
-bin/hwloc-gather-cpuid
+%%X86%%bin/hwloc-gather-cpuid
 bin/hwloc-info
 bin/hwloc-ls
 bin/hwloc-patch
@@ -42,7 +42,7 @@ man/man1/hwloc-calc.1.gz
 man/man1/hwloc-compress-dir.1.gz
 man/man1/hwloc-diff.1.gz
 man/man1/hwloc-distrib.1.gz
-man/man1/hwloc-gather-cpuid.1.gz
+%%X86%%man/man1/hwloc-gather-cpuid.1.gz
 man/man1/hwloc-info.1.gz
 man/man1/hwloc-ls.1.gz
 man/man1/hwloc-patch.1.gz



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