OK for after unlock.
On 2019/04/07 20:05, Charlene Wendling wrote:
> Hi ports,
>
> I'm testing my final x11/qt4 gcc-8 fix diff against x11/kde4/marble,
> and during the build databases/strigi failed with:
>
> luceneindexreader.cpp:325:37: error: no matching function for call to
> 'make_pair<const string, std::__cxx11::string>(std::__cxx11::string,
> std::__cxx11::string&)'
>
> It occurs because std::make_pair syntax changed since C++11, and again
> for C++14 (the latter being the gcc-8's default C++ standard used) [0].
>
> We simply need to remove the conditional that limited the use of C++03
> to base-clang archs to fix this.
>
> It builds without issues on macppc/gcc-8 [1], and allows building
> kde4-libs.
>
>
> Charlène.
>
>
> [0] https://en.cppreference.com/w/cpp/utility/pair/make_pair
> [1] http://0x0.st/zZSY.txt
>
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/databases/strigi/Makefile,v
> retrieving revision 1.28
> diff -u -p -r1.28 Makefile
> --- Makefile 20 Feb 2019 11:22:26 -0000 1.28
> +++ Makefile 7 Apr 2019 10:02:26 -0000
> @@ -2,7 +2,7 @@
>
> COMMENT = document indexer
> DISTNAME = strigi-0.7.8
> -REVISION = 0
> +REVISION = 1
> CATEGORIES = databases devel textproc sysutils
>
> HOMEPAGE = https://www.vandenoever.info/software/strigi/
> @@ -46,9 +46,7 @@ CONFIGURE_ARGS = -DENABLE_LOG4CXX=No
> # Depends on Java
> CONFIGURE_ARGS += -DENABLE_REGENERATEXSD=No
>
> -.include <bsd.port.arch.mk>
> -.if ${PROPERTIES:Mclang}
> -CXXFLAGS += --std=c++03
> -.endif
> +# Doesn't build with C++14
> +CXXFLAGS += --std=c++03
>
> .include <bsd.port.mk>
>
