mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-19 19:59:43 +00:00
Code Issues Releases Activity

lang/cint: Unbreak build with GCC 9

Browse Source 
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)
This commit is contained in:
Tobias Kortkamp 2019-07-03 07:16:03 +00:00
parent 43633b0725
commit c5c25db059
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=505728
6 changed files with 60 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lang/cint/Makefile
View File

@ -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@

14
lang/cint/files/patch-cint_lib_prec__stl_list Normal file
View File

@ -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:

11
lang/cint/files/patch-cint_lib_prec__stl_map Normal file
View File

@ -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

11
lang/cint/files/patch-cint_lib_prec__stl_multimap Normal file
View File

@ -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

11
lang/cint/files/patch-cint_lib_prec__stl_multiset Normal file
View File

@ -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

11
lang/cint/files/patch-cint_lib_prec__stl_set Normal file
View File

@ -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