diff options
| author | Don Lewis <truckman@FreeBSD.org> | 2021-12-01 01:40:19 -0800 |
|---|---|---|
| committer | Don Lewis <truckman@FreeBSD.org> | 2021-12-01 01:53:11 -0800 |
| commit | 3adea779c689b7f81b77a81c802e892674d025af (patch) | |
| tree | d0df6bbd40ec0deaf4030748c7dfb5839efe8075 /editors/openoffice-devel | |
| parent | www/py-django-tinymce: Update to 3.4.0 (diff) | |
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
Diffstat (limited to 'editors/openoffice-devel')
| -rw-r--r-- | editors/openoffice-devel/Makefile | 14 |
1 files changed, 9 insertions, 5 deletions
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 |