[linimon at FreeBSD.org: svn commit: r513791 - head/textproc/libxml2]

[Mark Linimon]

FYI

mcl

----- Forwarded message from Mark Linimon <linimon at FreeBSD.org> -----

Date: Fri, 4 Oct 2019 22:24:37 +0000 (UTC)
From: Mark Linimon <linimon at FreeBSD.org>
To: ports-committers at freebsd.org, svn-ports-all at freebsd.org, svn-ports-head at freebsd.org
Subject: svn commit: r513791 - head/textproc/libxml2

Author: linimon
Date: Fri Oct  4 22:24:36 2019
New Revision: 513791
URL: https://svnweb.freebsd.org/changeset/ports/513791

Log:
  Prepare for powerpc-on-clang by deleting hard-coded tests for libstdc++.so
  as a stand-in for "are we running on gcc".
  
  For people already testing powerpc on clang, it is possible that they
  already have both compilers in base.  Thus, the assumption that "gcc is
  in base" (e.g.  libstdc++.so exists) always means "force use of GCC" is
  already broken.  It will be for everyone on -CURRENT once the switch is
  made.
  
  Tested on both amd64 and powerpc64.
  
  PR:		239153
  Approved by:	gnome (maintainer-timeout, > 1 month)

Modified:
  head/textproc/libxml2/Makefile

Modified: head/textproc/libxml2/Makefile
==============================================================================
--- head/textproc/libxml2/Makefile	Fri Oct  4 22:20:03 2019	(r513790)
+++ head/textproc/libxml2/Makefile	Fri Oct  4 22:24:36 2019	(r513791)
@@ -21,7 +21,7 @@ LICENSE_FILE_TRIO=	${FILESDIR}/LICENSE.TRIO
 LICENSE_PERMS_TRIO=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 GNU_CONFIGURE=	yes
-USES+=		cpe gmake iconv libtool pathfix pkgconfig shebangfix
+USES+=		compiler cpe gmake iconv libtool pathfix pkgconfig shebangfix
 CPE_VENDOR=	xmlsoft
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS?=--with-iconv=${ICONV_PREFIX} \
@@ -54,6 +54,8 @@ THREAD_ALLOC_CONFIGURE_WITH=	thread-alloc
 
 .endif # !defined(MASTERDIR)
 
+.include <bsd.port.pre.mk>
+
 post-patch:
 .for d in . doc doc/devhelp doc/examples
 	@${REINPLACE_CMD} -e '/^install-data-am:/ s|install-data-local||' \
@@ -65,7 +67,7 @@ post-patch:
 		 s|/etc/sgml/catalog|${LOCALBASE}/share/sgml/catalog|g' \
 		${WRKSRC}/${f}
 .endfor
-.if exists(/usr/lib/libstdc++.so)
+.if ${CHOSEN_COMPILER_TYPE} == gcc
 	@${REINPLACE_CMD} -e 's/ -Wno-array-bounds//' ${WRKSRC}/configure
 .endif
 
@@ -74,6 +76,6 @@ post-install:
 	@${RM} -r ${STAGEDIR}${PREFIX}/share/gtk-doc
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
 
 .endif

----- End forwarded message -----