From nobody Wed Dec 01 22:33:33 2021 X-Original-To: dev-commits-ports-branches@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 4F7B318AB512; Wed, 1 Dec 2021 22:33:34 +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 4J4DQ60NtNz4S2n; Wed, 1 Dec 2021 22:33:34 +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 E1F8612346; Wed, 1 Dec 2021 22:33:33 +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 1B1MXXQu054142; Wed, 1 Dec 2021 22:33:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B1MXX2V054141; Wed, 1 Dec 2021 22:33:33 GMT (envelope-from git) Date: Wed, 1 Dec 2021 22:33:33 GMT Message-Id: <202112012233.1B1MXX2V054141@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Don Lewis Subject: git: e7559466c039 - 2021Q4 - editors/openoffice*: unbreak build with clang 13+ List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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/2021Q4 X-Git-Reftype: branch X-Git-Commit: e7559466c039b193540e17f75ae47ea90a2c56f2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638398014; 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=3OCUeFKP0jEpHewVPWlx2Xq3ihlUeXDRotIsaiFN6Ew=; b=P4GOYewacTxtG4SoYlAaOjL6gL4q4ez0wTo+Wmtgyt6Mnrc2diqv/Rv++IDTp9xgN9Ty8X 35GVfy3UfrFPBRiIjpR3juoTYAie4oeAgFjXCYyV+T8/Ell9JLWZr0O6Y0b0FWKxAhrlhV gOe//E85h8CVDpGMloxfmjTkjToHCEDI4/trEJqQ9JbK2HlwAM9J/pG9c3vji2Csu925mx wk6zL86z8wUTWJ2nYIaMDNbOUEJQD7EGGBkqc5WwnszKOJfIPP0JFtb69zF0crvOcEt3xT RkhyJgcm/NInve8lcAdS70ml187+vzb6Kxzr//0kJ8vTTWie5yowtKIuXjksEg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638398014; a=rsa-sha256; cv=none; b=GwheskW+Spaimi3GfqYpT/ypF3j4C0vM78U2qizogUnC8HL7tGQESFFFcDUfAsFZsYUtRf iEQu7/z2pX1iNhIovpoDVKxtOiFPJ4oj60962qwCZBxHT8xWe68672NU1finYhHWlUeHoY piLw2qQdmjCaaS3/1ke5eY22fZ7V4OOveVnWMyNRTONZx9rpldQlmd0K2Il8H0JceBU/K5 U0QbC4A+B9d2jc16DGl/CxUxyu4E44EA8aCymJA2QABFhZ8sST6DcWTBGyOZysgDDLA1Qi m1uFeI2obJe7LnM9zLtP7935OZMPMq+T05cOZkTMtlP816Ob/vOEkEU5TYlPAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by truckman: URL: https://cgit.FreeBSD.org/ports/commit/?id=e7559466c039b193540e17f75ae47ea90a2c56f2 commit e7559466c039b193540e17f75ae47ea90a2c56f2 Author: Don Lewis AuthorDate: 2021-12-01 09:40:19 +0000 Commit: Don Lewis CommitDate: 2021-12-01 22:33:04 +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 (cherry picked from commit 3adea779c689b7f81b77a81c802e892674d025af) --- 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 0aee52fbbc34..b342adbad08f 100644 --- a/editors/openoffice-4/Makefile +++ b/editors/openoffice-4/Makefile @@ -212,9 +212,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 @@ -223,7 +226,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 @@ -340,7 +344,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 0bee92b8bbd9..7d312d3f0dfa 100644 --- a/editors/openoffice-devel/Makefile +++ b/editors/openoffice-devel/Makefile @@ -251,15 +251,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 @@ -371,7 +375,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