From nobody Wed Dec 01 09:53:24 2021 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 790BA18B3DE3; Wed, 1 Dec 2021 09:53:25 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4J3vY11TZHz3wWD; Wed, 1 Dec 2021 09:53:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 127AF27822; Wed, 1 Dec 2021 09:53:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1B19rO1U039514; Wed, 1 Dec 2021 09:53:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B19rO6S039513; Wed, 1 Dec 2021 09:53:24 GMT (envelope-from git) Date: Wed, 1 Dec 2021 09:53:24 GMT Message-Id: <202112010953.1B19rO6S039513@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Don Lewis Subject: git: 3adea779c689 - main - editors/openoffice*: unbreak build with clang 13+ List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: truckman X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3adea779c689b7f81b77a81c802e892674d025af Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638352405; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=11UQ5NonbSCWw/rDfqjMWBH/X5gS6iC9q4X/omW5ed4=; b=YILwQqWPEObB9acziSSxjLrA3pDJAMPSXY4RX3KV/qlbF5SU3H7ybyPcf5uIo+adaSZ/Ns PvsY51cno88/wM00/987iaFM4wr2lNVUDxOSwpZ0H+pq7pK7NCk/HbEDLgUUvOM+/8uYNY 2C+cPZkbjAfQ/u0D0DBGOsVaGe4rpvYFNczdE+aGzCaug4rWGRySjILC3qXrV+URDTtOw+ pqVV0DnfDA3r3LqPcPT+W7+QSTMEpYHswT7f/xpWw80rN95SYbGu4aVbKV3dKAtCrcwpnj yseQVLy4rg4KCimOHW3gwNkG1zpOgCd2lN4VDBkVE8MTlPEgQyZ8J9VhfwLYOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638352405; a=rsa-sha256; cv=none; b=CVkYqrf9VHBFHFWj/fed7Uvp9nbKRDTLzgQWlyyrlQoIBF4GeznxvFERdm3l+ahGPJiukD LalZAvslMpuWTh3GBHFpGj7qmNePYsLCBFrq2e50QHb1Y7baMLjZyThJTR7ZK9J7DH2DA0 k5BqOoh+kQPXOXxQZs4l948v4Gp2k3VR5lI6j91IXIaYxnk6t0fr71P4LynJpXF+MNX2Ay l+rIm4uisk2yk6N/48es9N7LSa7gr0ZYT4AiIJ/2Dxy1wTuKpB+g4yZP6tRJweW/6MbKS0 aAPFMF9zi8pbfjabGnTx5ji0GIYTFK/aK1WhMDpWAqn6LBTWK90VZwFMWxTXdQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by truckman: URL: https://cgit.FreeBSD.org/ports/commit/?id=3adea779c689b7f81b77a81c802e892674d025af commit 3adea779c689b7f81b77a81c802e892674d025af Author: Don Lewis AuthorDate: 2021-12-01 09:40:19 +0000 Commit: Don Lewis CommitDate: 2021-12-01 09:53:11 +0000 editors/openoffice*: unbreak build with clang 13+ The include file vigra/memory.hxx from the graphics/vigra port has this error: /usr/local/include/vigra/memory.hxx:43:12: fatal error: 'tr1/memory' file not found # include ^~~~~~~~~~~~ when compiling with clang 13.0 or newer in -std=gnu++98 mode. MFH: 2021Q4 --- editors/openoffice-4/Makefile | 14 +++++++++----- editors/openoffice-devel/Makefile | 14 +++++++++----- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/editors/openoffice-4/Makefile b/editors/openoffice-4/Makefile index dcf6e61ae326..95e6d692d36f 100644 --- a/editors/openoffice-4/Makefile +++ b/editors/openoffice-4/Makefile @@ -211,9 +211,12 @@ GCC_EXTRA_DISTFILES= d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2 \ .if ${CHOSEN_COMPILER_TYPE} == clang CPPFLAGS+= -I${LOCALBASE}/include -CONFIGURE_ARGS+= --with-system-boost --with-system-vigra -BUILD_DEPENDS+= ${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs \ - ${LOCALBASE}/bin/vigra-config:graphics/vigra +CONFIGURE_ARGS+= --with-system-boost +BUILD_DEPENDS+= ${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs +. if ${COMPILER_VERSION} < 130 +CONFIGURE_ARGS+= --with-system-vigra +BUILD_DEPENDS+= ${LOCALBASE}/bin/vigra-config:graphics/vigra +. endif . if ${ARCH} == amd64 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-align16 . endif @@ -222,7 +225,8 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch-align16 # These extra distfiles are needed to use the bundled versions of # boost and vigra for compatiblity with gcc. Also include them # for the makesum target so they are included in distinfo -.if ${CHOSEN_COMPILER_TYPE} == gcc || make(makesum) || make(distclean) +.if ${CHOSEN_COMPILER_TYPE} == gcc || ${COMPILER_VERSION} >= 130 || \ + make(makesum) || make(distclean) DISTFILES+= ${GCC_EXTRA_DISTFILES:C/.*/&:sf/g} .endif @@ -339,7 +343,7 @@ do-extract-SDK-on: post-extract: ${TAR} -C ${WRKSUBDIR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${EXTSRC} ${CP} ${DISTDIR}/${DIST_SUBDIR}/${PYTHON_DISTFILE} ${WRKSUBDIR}/ext_sources/${PYTHON_DISTFILE} -.if ${CHOSEN_COMPILER_TYPE} == gcc +.if ${CHOSEN_COMPILER_TYPE} == gcc || ${COMPILER_VERSION} >= 130 . for f in ${GCC_EXTRA_DISTFILES} ${CP} ${DISTDIR}/${DIST_SUBDIR}/${f} ${WRKSUBDIR}/ext_sources/${f} . endfor diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile index b77540446f97..7118d540cb49 100644 --- a/editors/openoffice-devel/Makefile +++ b/editors/openoffice-devel/Makefile @@ -249,15 +249,19 @@ GCC_EXTRA_DISTFILES= d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2 \ .if ${CHOSEN_COMPILER_TYPE} == clang CPPFLAGS+= -I${LOCALBASE}/include -CONFIGURE_ARGS+= --with-system-boost --with-system-vigra -BUILD_DEPENDS+= ${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs \ - ${LOCALBASE}/bin/vigra-config:graphics/vigra +CONFIGURE_ARGS+= --with-system-boost +BUILD_DEPENDS+= ${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs +. if ${COMPILER_VERSION} < 130 +CONFIGURE_ARGS+= --with-system-vigra +BUILD_DEPENDS+= ${LOCALBASE}/bin/vigra-config:graphics/vigra +. endif .endif # These extra distfiles are needed to use the bundled versions of # boost and vigra for compatiblity with gcc. Also include them # for the makesum target so they are included in distinfo -.if ${CHOSEN_COMPILER_TYPE} == gcc || make(makesum) || make(distclean) +.if ${CHOSEN_COMPILER_TYPE} == gcc || ${COMPILER_VERSION} >= 130 || \ + make(makesum) || make(distclean) DISTFILES+= ${GCC_EXTRA_DISTFILES:C/.*/&:sf/g} .endif @@ -369,7 +373,7 @@ do-extract-SDK-on: post-extract: ${TAR} -C ${WRKSUBDIR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${EXTSRC} -.if ${CHOSEN_COMPILER_TYPE} == gcc +.if ${CHOSEN_COMPILER_TYPE} == gcc || ${COMPILER_VERSION} >= 130 . for f in ${GCC_EXTRA_DISTFILES} ${CP} ${DISTDIR}/${DIST_SUBDIR}/${f} ${WRKSUBDIR}/ext_sources/${f} . endfor