kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

editors/openoffice*: unbreak build with clang 13+

Browse source 
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 3adea779c6)
This commit is contained in:
Don Lewis 2021-12-01 01:40:19 -08:00
parent 5b7dfe597e
commit e7559466c0
2 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
editors/openoffice-4/Makefile
View file

@ -212,9 +212,12 @@ GCC_EXTRA_DISTFILES= d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2 \
.if ${CHOSEN_COMPILER_TYPE} == clang .if ${CHOSEN_COMPILER_TYPE} == clang
CPPFLAGS+= -I${LOCALBASE}/include CPPFLAGS+= -I${LOCALBASE}/include
CONFIGURE_ARGS+= --with-system-boost --with-system-vigra CONFIGURE_ARGS+= --with-system-boost
BUILD_DEPENDS+= ${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs \ BUILD_DEPENDS+= ${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs
${LOCALBASE}/bin/vigra-config:graphics/vigra . if ${COMPILER_VERSION} < 130
CONFIGURE_ARGS+= --with-system-vigra
BUILD_DEPENDS+= ${LOCALBASE}/bin/vigra-config:graphics/vigra
. endif
. if ${ARCH} == amd64 . if ${ARCH} == amd64
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-align16 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-align16
. endif . endif
@ -223,7 +226,8 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch-align16
# These extra distfiles are needed to use the bundled versions of # These extra distfiles are needed to use the bundled versions of
# boost and vigra for compatiblity with gcc. Also include them # boost and vigra for compatiblity with gcc. Also include them
# for the makesum target so they are included in distinfo # 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} DISTFILES+= ${GCC_EXTRA_DISTFILES:C/.*/&:sf/g}
.endif .endif
@ -340,7 +344,7 @@ do-extract-SDK-on:
post-extract: post-extract:
${TAR} -C ${WRKSUBDIR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${EXTSRC} ${TAR} -C ${WRKSUBDIR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${EXTSRC}
${CP} ${DISTDIR}/${DIST_SUBDIR}/${PYTHON_DISTFILE} ${WRKSUBDIR}/ext_sources/${PYTHON_DISTFILE} ${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} . for f in ${GCC_EXTRA_DISTFILES}
${CP} ${DISTDIR}/${DIST_SUBDIR}/${f} ${WRKSUBDIR}/ext_sources/${f} ${CP} ${DISTDIR}/${DIST_SUBDIR}/${f} ${WRKSUBDIR}/ext_sources/${f}
. endfor . endfor

14
editors/openoffice-devel/Makefile
View file

@ -251,15 +251,19 @@ GCC_EXTRA_DISTFILES= d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2 \
.if ${CHOSEN_COMPILER_TYPE} == clang .if ${CHOSEN_COMPILER_TYPE} == clang
CPPFLAGS+= -I${LOCALBASE}/include CPPFLAGS+= -I${LOCALBASE}/include
CONFIGURE_ARGS+= --with-system-boost --with-system-vigra CONFIGURE_ARGS+= --with-system-boost
BUILD_DEPENDS+= ${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs \ BUILD_DEPENDS+= ${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs
${LOCALBASE}/bin/vigra-config:graphics/vigra . if ${COMPILER_VERSION} < 130
CONFIGURE_ARGS+= --with-system-vigra
BUILD_DEPENDS+= ${LOCALBASE}/bin/vigra-config:graphics/vigra
. endif
.endif .endif
# These extra distfiles are needed to use the bundled versions of # These extra distfiles are needed to use the bundled versions of
# boost and vigra for compatiblity with gcc. Also include them # boost and vigra for compatiblity with gcc. Also include them
# for the makesum target so they are included in distinfo # 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} DISTFILES+= ${GCC_EXTRA_DISTFILES:C/.*/&:sf/g}
.endif .endif
@ -371,7 +375,7 @@ do-extract-SDK-on:
post-extract: post-extract:
${TAR} -C ${WRKSUBDIR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${EXTSRC} ${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} . for f in ${GCC_EXTRA_DISTFILES}
${CP} ${DISTDIR}/${DIST_SUBDIR}/${f} ${WRKSUBDIR}/ext_sources/${f} ${CP} ${DISTDIR}/${DIST_SUBDIR}/${f} ${WRKSUBDIR}/ext_sources/${f}
. endfor . endfor