diff options
author | joerg <joerg@pkgsrc.org> | 2020-05-14 19:04:51 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2020-05-14 19:04:51 +0000 |
commit | 52396a55fa846198d74f2336671e1d884771052b (patch) | |
tree | 68ae1eca69aba05e6ccee8dc6cccdfa31a516c80 /textproc | |
parent | 4efc69fb1e968e8c22c6763762ed8c110cde76ed (diff) | |
download | pkgsrc-52396a55fa846198d74f2336671e1d884771052b.tar.gz |
libxml++ is not ready for the recent C++ standards due to using
functionality that has been removed from the spec. Don't force such late
standards.
Diffstat (limited to 'textproc')
-rw-r--r-- | textproc/hfstospell/Makefile | 4 | ||||
-rw-r--r-- | textproc/hfstospell/distinfo | 3 | ||||
-rw-r--r-- | textproc/hfstospell/patches/patch-configure | 82 |
3 files changed, 86 insertions, 3 deletions
diff --git a/textproc/hfstospell/Makefile b/textproc/hfstospell/Makefile index 1b6073d73a8..eb328070911 100644 --- a/textproc/hfstospell/Makefile +++ b/textproc/hfstospell/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2020/04/12 08:28:07 adam Exp $ +# $NetBSD: Makefile,v 1.6 2020/05/14 19:04:51 joerg Exp $ GITHUB_PROJECT= hfst-ospell DISTNAME= hfstospell-0.5.1 @@ -15,7 +15,7 @@ LICENSE= apache-2.0 GNU_CONFIGURE= yes USE_TOOLS+= pkg-config USE_LIBTOOL= yes -USE_LANGUAGES= c c++14 +USE_LANGUAGES= c c++11 PKGCONFIG_OVERRIDE+= hfstospell.pc.in diff --git a/textproc/hfstospell/distinfo b/textproc/hfstospell/distinfo index ef154f25ebf..1581538872a 100644 --- a/textproc/hfstospell/distinfo +++ b/textproc/hfstospell/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.1 2018/10/26 20:43:07 bsiegert Exp $ +$NetBSD: distinfo,v 1.2 2020/05/14 19:04:51 joerg Exp $ SHA1 (hfstospell-0.5.1.tar.gz) = 9436d3ea7905160b31e75a2d8b9272cc6723e9dd RMD160 (hfstospell-0.5.1.tar.gz) = 6335a09d80b5efaefb9034882d7d44f4e696d442 SHA512 (hfstospell-0.5.1.tar.gz) = 301c9c2acfabb454069c9357db9c860e7270d3b111f469d9e691fb9126c2f031b3dbf8af6a97d6be857a97e930321e6f07736d271f92ee082364d3fe3be2a09b Size (hfstospell-0.5.1.tar.gz) = 452024 bytes +SHA1 (patch-configure) = 5424cfe46d254db820da8cc1a05e443125623572 diff --git a/textproc/hfstospell/patches/patch-configure b/textproc/hfstospell/patches/patch-configure new file mode 100644 index 00000000000..78f4f3dcc69 --- /dev/null +++ b/textproc/hfstospell/patches/patch-configure @@ -0,0 +1,82 @@ +$NetBSD: patch-configure,v 1.1 2020/05/14 19:04:51 joerg Exp $ + +Let's not force C++20 when the libxml++ dependency can't deal with it. + +--- configure.orig 2018-10-15 11:35:17.000000000 +0000 ++++ configure +@@ -18472,14 +18472,14 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler accepts -std=c++20" >&5 +-$as_echo_n "checking whether C++ compiler accepts -std=c++20... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler accepts -std=c++14" >&5 ++$as_echo_n "checking whether C++ compiler accepts -std=c++14... " >&6; } + if ${ax_cv_check_cxxflags___std_cpp20+:} false; then : + $as_echo_n "(cached) " >&6 + else + + ax_check_save_flags=$CXXFLAGS +- CXXFLAGS="$CXXFLAGS -std=c++20" ++ CXXFLAGS="$CXXFLAGS -std=c++14" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -18502,7 +18502,7 @@ fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cxxflags___std_cpp20" >&5 + $as_echo "$ax_cv_check_cxxflags___std_cpp20" >&6; } + if test x"$ax_cv_check_cxxflags___std_cpp20" = xyes; then : +- CXXFLAGS="$CXXFLAGS -std=c++20" ++ CXXFLAGS="$CXXFLAGS -std=c++14" + else + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler accepts -std=c++2a" >&5 +@@ -18538,14 +18538,14 @@ if test x"$ax_cv_check_cxxflags___std_cp + CXXFLAGS="$CXXFLAGS -std=c++2a" + else + +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler accepts -std=c++17" >&5 +-$as_echo_n "checking whether C++ compiler accepts -std=c++17... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler accepts -std=c++14" >&5 ++$as_echo_n "checking whether C++ compiler accepts -std=c++14... " >&6; } + if ${ax_cv_check_cxxflags___std_cpp17+:} false; then : + $as_echo_n "(cached) " >&6 + else + + ax_check_save_flags=$CXXFLAGS +- CXXFLAGS="$CXXFLAGS -std=c++17" ++ CXXFLAGS="$CXXFLAGS -std=c++14" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -18568,17 +18568,17 @@ fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cxxflags___std_cpp17" >&5 + $as_echo "$ax_cv_check_cxxflags___std_cpp17" >&6; } + if test x"$ax_cv_check_cxxflags___std_cpp17" = xyes; then : +- CXXFLAGS="$CXXFLAGS -std=c++17" ++ CXXFLAGS="$CXXFLAGS -std=c++14" + else + +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler accepts -std=c++1z" >&5 +-$as_echo_n "checking whether C++ compiler accepts -std=c++1z... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler accepts -std=c++14" >&5 ++$as_echo_n "checking whether C++ compiler accepts -std=c++14... " >&6; } + if ${ax_cv_check_cxxflags___std_cpp1z+:} false; then : + $as_echo_n "(cached) " >&6 + else + + ax_check_save_flags=$CXXFLAGS +- CXXFLAGS="$CXXFLAGS -std=c++1z" ++ CXXFLAGS="$CXXFLAGS -std=c++14" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -18601,7 +18601,7 @@ fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cxxflags___std_cpp1z" >&5 + $as_echo "$ax_cv_check_cxxflags___std_cpp1z" >&6; } + if test x"$ax_cv_check_cxxflags___std_cpp1z" = xyes; then : +- CXXFLAGS="$CXXFLAGS -std=c++1z" ++ CXXFLAGS="$CXXFLAGS -std=c++14" + else + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler accepts -std=c++14" >&5 |