Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 23 Mar 2020 10:59:59 +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: r528967 - head/sysutils/passwordsafe
Message-ID:  <202003231059.02NAxxTs071670@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pkubaj
Date: Mon Mar 23 10:59:59 2020
New Revision: 528967
URL: https://svnweb.freebsd.org/changeset/ports/528967

Log:
  sysutils/passwordsafe: fix build on powerpc64 elfv2
  
  Switch to GCC on powerpc64, due to (already reported upstream) clang bug:
  Assertion failed: (CAT && "unexpected type for array initializer"), function VisitCXXNewExpr, file /poudriere/jails/powerpc64-head/usr/src/contrib/llvm-project/clang/lib/AST/ExprConstant.cpp, line 8690.

Modified:
  head/sysutils/passwordsafe/Makefile

Modified: head/sysutils/passwordsafe/Makefile
==============================================================================
--- head/sysutils/passwordsafe/Makefile	Mon Mar 23 10:45:03 2020	(r528966)
+++ head/sysutils/passwordsafe/Makefile	Mon Mar 23 10:59:59 2020	(r528967)
@@ -20,7 +20,7 @@ BUILD_DEPENDS=	zip:archivers/zip
 
 CONFLICTS=	pwsafe-[0-9]*
 
-USES=		compiler:c++11-lang gmake xorg
+USES=		gmake xorg
 USE_GITHUB=	yes
 USE_WX=		3.0+
 USE_XORG=	x11 xtst
@@ -42,6 +42,14 @@ WANT_WX_VER=	3.0
 LDFLAGS=	-L${PREFIX}/lib -lqrencode
 
 ALL_TARGET=	unicoderelease
+
+.include <bsd.port.options.mk>
+
+.if defined(PPC_ABI) && ${PPC_ABI} == ELFv2
+USES+=		compiler:gcc-c++11-lib
+.else
+USES+=		compiler:c++11-lang
+.endif
 
 post-patch:
 .	for f in Makefile.freebsd help/Makefile.freebsd src/os/unix/Makefile \



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