From owner-svn-ports-all@freebsd.org Fri Oct 4 22:24:37 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9518613B46D; Fri, 4 Oct 2019 22:24:37 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46lPYx3M7tz3xhW; Fri, 4 Oct 2019 22:24:37 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 566EF308E; Fri, 4 Oct 2019 22:24:37 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x94MObqp087908; Fri, 4 Oct 2019 22:24:37 GMT (envelope-from linimon@FreeBSD.org) Received: (from linimon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x94MOb3K087907; Fri, 4 Oct 2019 22:24:37 GMT (envelope-from linimon@FreeBSD.org) Message-Id: <201910042224.x94MOb3K087907@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: linimon set sender to linimon@FreeBSD.org using -f From: Mark Linimon Date: Fri, 4 Oct 2019 22:24:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r513791 - head/textproc/libxml2 X-SVN-Group: ports-head X-SVN-Commit-Author: linimon X-SVN-Commit-Paths: head/textproc/libxml2 X-SVN-Commit-Revision: 513791 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Oct 2019 22:24:37 -0000 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 + 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 +.include .endif