Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 15 Feb 2020 11:35:36 +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: r526217 - head/misc/vxl
Message-ID:  <202002151135.01FBZaHt010918@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: linimon
Date: Sat Feb 15 11:35:36 2020
New Revision: 526217
URL: https://svnweb.freebsd.org/changeset/ports/526217

Log:
  Conditionalize plist to fix install on powerpc64 (and, presumably,
  on all !x86 systems):
  
    pkg-static: Unable to access file /wrkdirs/usr/ports/misc/vxl/work/stageusr/local/include/vxl/core/vil/vil_math_sse.h:No such file or directory
    pkg-static: Unable to access file /wrkdirs/usr/ports/misc/vxl/work/stageusr/local/include/vxl/core/vil/vil_math_sse.hxx:No such file or directory
  
  Approved by:	portmgr (tier-2 blanket)

Modified:
  head/misc/vxl/Makefile
  head/misc/vxl/pkg-plist

Modified: head/misc/vxl/Makefile
==============================================================================
--- head/misc/vxl/Makefile	Sat Feb 15 10:41:11 2020	(r526216)
+++ head/misc/vxl/Makefile	Sat Feb 15 11:35:36 2020	(r526217)
@@ -27,4 +27,12 @@ do-test:
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} == "amd64" || ${ARCH} == "i386"
+PLIST_SUB+=	X86=""
+.else
+PLIST_SUB+=	X86="@comment "
+.endif
+
+.include <bsd.port.post.mk>

Modified: head/misc/vxl/pkg-plist
==============================================================================
--- head/misc/vxl/pkg-plist	Sat Feb 15 10:41:11 2020	(r526216)
+++ head/misc/vxl/pkg-plist	Sat Feb 15 11:35:36 2020	(r526217)
@@ -498,8 +498,8 @@ include/vxl/core/vil/vil_image_view.hxx
 include/vxl/core/vil/vil_image_view_base.h
 include/vxl/core/vil/vil_load.h
 include/vxl/core/vil/vil_math.h
-include/vxl/core/vil/vil_math_sse.h
-include/vxl/core/vil/vil_math_sse.hxx
+%%X86%%include/vxl/core/vil/vil_math_sse.h
+%%X86%%include/vxl/core/vil/vil_math_sse.hxx
 include/vxl/core/vil/vil_memory_chunk.h
 include/vxl/core/vil/vil_memory_image.h
 include/vxl/core/vil/vil_na.h



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