Date: Wed, 1 Dec 2021 22:33:33 GMT From: Don Lewis <truckman@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: e7559466c039 - 2021Q4 - editors/openoffice*: unbreak build with clang 13+ Message-ID: <202112012233.1B1MXX2V054141@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2021Q4 has been updated by truckman: URL: https://cgit.FreeBSD.org/ports/commit/?id=e7559466c039b193540e17f75ae47ea90a2c56f2 commit e7559466c039b193540e17f75ae47ea90a2c56f2 Author: Don Lewis <truckman@FreeBSD.org> AuthorDate: 2021-12-01 09:40:19 +0000 Commit: Don Lewis <truckman@FreeBSD.org> 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 <tr1/memory> ^~~~~~~~~~~~ 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202112012233.1B1MXX2V054141>