Date: Wed, 3 Jul 2019 07:16:03 +0000 (UTC) From: Tobias Kortkamp <tobik@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r505728 - in head/lang/cint: . files Message-ID: <201907030716.x637G3op076475@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tobik Date: Wed Jul 3 07:16:03 2019 New Revision: 505728 URL: https://svnweb.freebsd.org/changeset/ports/505728 Log: lang/cint: Unbreak build with GCC 9 G__cpp_list.cxx: In function 'int G__list_49_0_10(G__value*, const char*, G__param*, int)': G__cpp_list.cxx:707:109: error: 'std::__cxx11::list<int, std::allocator<int> >::iterator' {aka 'struct std::_List_iterator<int>'} has no member named 'operator=='; did you mean 'operator='? 707 | G__letint(result7, 103, (long) ((list<int,allocator<int> >::iterator*) G__getstructoffset())->operator==(*(list<int,allocator<int> >::iterator*) libp->para[0].ref)); | ^~ | operator= G__cpp_list.cxx: In function 'int G__list_49_0_11(G__value*, const char*, G__param*, int)': G__cpp_list.cxx:713:109: error: 'std::__cxx11::list<int, std::allocator<int> >::iterator' {aka 'struct std::_List_iterator<int>'} has no member named 'operator!='; did you mean 'operator='? 713 | G__letint(result7, 103, (long) ((list<int,allocator<int> >::iterator*) G__getstructoffset())->operator!=(*(list<int,allocator<int> >::iterator*) libp->para[0].ref)); | ^~ | operator= http://pb2.nyi.freebsd.org/data/120i386-default-PR238330/2019-06-09_20h27m22s/logs/errors/cint-5.18.00_12.log While here make the build abort fast on build errors instead of carrying on like nothing happened. PR: 238907 Reported by: antoine (via exp-run in PR 238330) Added: head/lang/cint/files/patch-cint_lib_prec__stl_list (contents, props changed) head/lang/cint/files/patch-cint_lib_prec__stl_map (contents, props changed) head/lang/cint/files/patch-cint_lib_prec__stl_multimap (contents, props changed) head/lang/cint/files/patch-cint_lib_prec__stl_multiset (contents, props changed) head/lang/cint/files/patch-cint_lib_prec__stl_set (contents, props changed) Modified: head/lang/cint/Makefile Modified: head/lang/cint/Makefile ============================================================================== --- head/lang/cint/Makefile Wed Jul 3 06:35:48 2019 (r505727) +++ head/lang/cint/Makefile Wed Jul 3 07:16:03 2019 (r505728) @@ -35,7 +35,8 @@ OPTIONS_DEFINE= DOCS post-patch: ${REINPLACE_CMD} 's,#!/bin/bash,#!${LOCALBASE}/bin/bash,' ${WRKSRC}/cint/lib/dll_stl/setup - ${REINPLACE_CMD} 's,make ,${GMAKE} ,' ${WRKSRC}/cint/lib/*/setup + ${REINPLACE_CMD} -e 's,make ,${GMAKE} ,' -e '/${GMAKE}/ s,$$, || exit 1,' \ + ${WRKSRC}/cint/lib/*/setup do-configure: cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${LOCALBASE}/bin/bash configure __have_the_proper_shell@ Added: head/lang/cint/files/patch-cint_lib_prec__stl_list ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/cint/files/patch-cint_lib_prec__stl_list Wed Jul 3 07:16:03 2019 (r505728) @@ -0,0 +1,14 @@ +--- cint/lib/prec_stl/list.orig 2019-07-03 06:45:32 UTC ++++ cint/lib/prec_stl/list +@@ -96,9 +96,11 @@ class list { + iterator operator++(int a); + iterator& operator--(); + iterator operator--(int a); ++#if defined(G__GNUC_VER) && G__GNUC_VER<9000 + bool operator==(const iterator& x) ; + #ifndef G__HPUX + bool operator!=(const iterator& x) ; ++#endif + #endif + #if defined(G__VISUAL) && (G__MSC_VER>=1600) + private: Added: head/lang/cint/files/patch-cint_lib_prec__stl_map ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/cint/files/patch-cint_lib_prec__stl_map Wed Jul 3 07:16:03 2019 (r505728) @@ -0,0 +1,11 @@ +--- cint/lib/prec_stl/map.orig 2019-07-03 06:37:58 UTC ++++ cint/lib/prec_stl/map +@@ -115,7 +115,7 @@ class map { + iterator operator++(int a); + iterator& operator--(); + iterator operator--(int a); +-#if defined (G__VISUAL) || (defined(G__GNUC_VER) && G__GNUC_VER>=3004) || defined(G__INTEL_COMPILER) ++#if defined (G__VISUAL) || (defined(G__GNUC_VER) && G__GNUC_VER>=3004 && G__GNUC_VER<9000) || defined(G__INTEL_COMPILER) + bool operator==(const iterator& x) ; + bool operator!=(const iterator& x) ; + #endif Added: head/lang/cint/files/patch-cint_lib_prec__stl_multimap ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/cint/files/patch-cint_lib_prec__stl_multimap Wed Jul 3 07:16:03 2019 (r505728) @@ -0,0 +1,11 @@ +--- cint/lib/prec_stl/multimap.orig 2019-07-03 06:42:35 UTC ++++ cint/lib/prec_stl/multimap +@@ -112,7 +112,7 @@ class multimap { + iterator operator++(int a); + iterator& operator--(); + iterator operator--(int a); +-#if defined (G__VISUAL) || (defined(G__GNUC) && G__GNUC_VER>=3004) ++#if defined (G__VISUAL) || (defined(G__GNUC) && G__GNUC_VER>=3004 && G__GNUC_VER<9000) + bool operator==(const iterator& x) ; + bool operator!=(const iterator& x) ; + #endif Added: head/lang/cint/files/patch-cint_lib_prec__stl_multiset ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/cint/files/patch-cint_lib_prec__stl_multiset Wed Jul 3 07:16:03 2019 (r505728) @@ -0,0 +1,11 @@ +--- cint/lib/prec_stl/multiset.orig 2019-07-03 06:43:37 UTC ++++ cint/lib/prec_stl/multiset +@@ -105,7 +105,7 @@ class multiset { + iterator operator++(int a); + iterator& operator--(); + iterator operator--(int a); +-#if defined (G__VISUAL) || (defined(G__GNUC) && G__GNUC_VER>=3004) ++#if defined (G__VISUAL) || (defined(G__GNUC) && G__GNUC_VER>=3004 && G__GNUC_VER<9000) + bool operator==(const iterator& x) ; + bool operator!=(const iterator& x) ; + #endif Added: head/lang/cint/files/patch-cint_lib_prec__stl_set ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/cint/files/patch-cint_lib_prec__stl_set Wed Jul 3 07:16:03 2019 (r505728) @@ -0,0 +1,11 @@ +--- cint/lib/prec_stl/set.orig 2019-07-03 06:41:45 UTC ++++ cint/lib/prec_stl/set +@@ -105,7 +105,7 @@ class set { + iterator operator++(int a); + iterator& operator--(); + iterator operator--(int a); +-#if defined (G__VISUAL) || (defined(G__GNUC) && G__GNUC_VER>=3004) ++#if defined (G__VISUAL) || (defined(G__GNUC) && G__GNUC_VER>=3004 && G__GNUC_VER<9000) + bool operator==(const iterator& x) ; + bool operator!=(const iterator& x) ; + #endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201907030716.x637G3op076475>