[pkgsrc/trunk]: pkgsrc/net/irrtoolset-nox11 make compilation with gcc 2.95.* ...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/net/irrtoolset-nox11 make compilation with gcc 2.95.* ...
From: spz <spz%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 01:27:33 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/44d2eda3f195
branches:  trunk
changeset: 490231:44d2eda3f195
user:      spz <spz%pkgsrc.org@localhost>
date:      Sun Mar 06 11:40:21 2005 +0000

description:
make compilation with gcc 2.95.* work (mostly by rolling back includes
changes from IRRToolSet 4.8.1 within #if (__GNUC__ > 2) .. #else)
also incidentially fixes a bug in rusage.cc

diffstat:

 net/irrtoolset-nox11/distinfo         |  28 +++++++++++++++++--
 net/irrtoolset-nox11/patches/patch-am |  51 ++++++++++++++++++++++++----------
 net/irrtoolset-nox11/patches/patch-an |  51 ++++++++++++++++++++++++----------
 net/irrtoolset-nox11/patches/patch-ba |  16 ++++++++++
 net/irrtoolset-nox11/patches/patch-bb |  16 ++++++++++
 net/irrtoolset-nox11/patches/patch-bc |  16 ++++++++++
 net/irrtoolset-nox11/patches/patch-bd |  16 ++++++++++
 net/irrtoolset-nox11/patches/patch-be |  16 ++++++++++
 net/irrtoolset-nox11/patches/patch-bf |  16 ++++++++++
 net/irrtoolset-nox11/patches/patch-bg |  16 ++++++++++
 net/irrtoolset-nox11/patches/patch-bh |  16 ++++++++++
 net/irrtoolset-nox11/patches/patch-bi |  16 ++++++++++
 net/irrtoolset-nox11/patches/patch-bj |  16 ++++++++++
 net/irrtoolset-nox11/patches/patch-bk |  42 ++++++++++++++++++++++++++++
 net/irrtoolset-nox11/patches/patch-bl |  16 ++++++++++
 net/irrtoolset-nox11/patches/patch-bm |  16 ++++++++++
 net/irrtoolset-nox11/patches/patch-bn |  16 ++++++++++
 net/irrtoolset-nox11/patches/patch-bo |  16 ++++++++++
 net/irrtoolset-nox11/patches/patch-bp |  16 ++++++++++
 net/irrtoolset-nox11/patches/patch-bq |  16 ++++++++++
 net/irrtoolset-nox11/patches/patch-br |  16 ++++++++++
 net/irrtoolset-nox11/patches/patch-bs |  16 ++++++++++
 net/irrtoolset-nox11/patches/patch-bt |  16 ++++++++++
 net/irrtoolset-nox11/patches/patch-bu |  47 ++++++++++++++++++++++++++++++++
 net/irrtoolset-nox11/patches/patch-bv |  16 ++++++++++
 25 files changed, 506 insertions(+), 33 deletions(-)

diffs (truncated from 771 to 300 lines):

diff -r a629ad909341 -r 44d2eda3f195 net/irrtoolset-nox11/distinfo
--- a/net/irrtoolset-nox11/distinfo     Sun Mar 06 11:12:24 2005 +0000
+++ b/net/irrtoolset-nox11/distinfo     Sun Mar 06 11:40:21 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2005/03/04 14:55:57 spz Exp $
+$NetBSD: distinfo,v 1.4 2005/03/06 11:40:21 spz Exp $
 
 SHA1 (IRRToolSet-4.8.2.tar.gz) = f60a03cb6585503f1ef0b8b7c0a2ce7c39ce999c
 Size (IRRToolSet-4.8.2.tar.gz) = 953222 bytes
@@ -14,8 +14,8 @@
 SHA1 (patch-aj) = bdd8215f482ea203a3387345640b87b421fbfe82
 SHA1 (patch-ak) = 4a47bfdb462b2ec0beaa8dce028be569bc1d4e1e
 SHA1 (patch-al) = 83ee86276245a4431f963d8b6db8feb04598a5ad
-SHA1 (patch-am) = 2f4201b78809849403df63400bb503b134128774
-SHA1 (patch-an) = de98b8d1a60538e8802063679e772104b2df4461
+SHA1 (patch-am) = ae4d07005d20275a3b6a683ba04e5fc8aa84292d
+SHA1 (patch-an) = 19e899a3bf0bab28e5a9322e6001f59643ffe897
 SHA1 (patch-ao) = 6a9e0bb9552281b0424b5538096a0e2e6af54841
 SHA1 (patch-ap) = 0a87688c453d7576cdaa3dbef1b51c0fb6e8396a
 SHA1 (patch-aq) = a284f9fdacdedc50ee74acded9e4b21dca98de21
@@ -28,3 +28,25 @@
 SHA1 (patch-ax) = 24180d9b2485c400c5084b399ef8312be09971e4
 SHA1 (patch-ay) = 545a721115733810cd90cf360736f5e6a7d4196f
 SHA1 (patch-az) = 532ffcdda54a70e7ff57800a16feef5898b2bb82
+SHA1 (patch-ba) = 9ad9e3ff42415f40a92d7788afe9a74f9f27c957
+SHA1 (patch-bb) = 6d917213312f1884277d8081f5223e4890e11d8d
+SHA1 (patch-bc) = ece1c767df515d59f994de1981197f1869ac7928
+SHA1 (patch-bd) = f8d913316b8a65710efb38763ed97b1cb3ddef74
+SHA1 (patch-be) = 7b82dbaab51adba608ecf8632c0c3d2c347a3d5a
+SHA1 (patch-bf) = a8aac51938b649b168fc71ec1012fc16878e419f
+SHA1 (patch-bg) = 3a5aaf2e246b1e316890022f17c95b71935b494e
+SHA1 (patch-bh) = dc415ceac169b6f6775bf749918d65536cfdfe79
+SHA1 (patch-bi) = 4913c6fe6ef65e08091399579dd3abf368217db0
+SHA1 (patch-bj) = 12367917f957f898fb179b314c9c225922a839c3
+SHA1 (patch-bk) = 1965ade44411b113f84a471975dd23c9bf2fdae7
+SHA1 (patch-bl) = aad241e43a5b2d9fb41338527c5c92814bf2f45e
+SHA1 (patch-bm) = 1100b3b7d68a58bf7a9d61d98339c3bba5dfb440
+SHA1 (patch-bn) = 13e7b5e1c4c676fa0c42edf08bfa47d9fe67d708
+SHA1 (patch-bo) = 3c11577df912d52361025d426a7ecc3cadfe6d79
+SHA1 (patch-bp) = 5944c48114743a2771f3044beb84d767abe538df
+SHA1 (patch-bq) = 17523090fd787ce7f585060d49c92b0b1e64430e
+SHA1 (patch-br) = 72e7b86a31851a437dff832206c8d96f263a6b15
+SHA1 (patch-bs) = ff8b504a8b8aedb49bdc27bffc50f58c5878c5c6
+SHA1 (patch-bt) = 878e6723901f2f7e02416a2a7bbee0f2f4605af8
+SHA1 (patch-bu) = ea10d9cafc9032bd9f50ea6b81cab58779f6890e
+SHA1 (patch-bv) = d0584058eaddce6a03a7b90e5f44997d70afc51d
diff -r a629ad909341 -r 44d2eda3f195 net/irrtoolset-nox11/patches/patch-am
--- a/net/irrtoolset-nox11/patches/patch-am     Sun Mar 06 11:12:24 2005 +0000
+++ b/net/irrtoolset-nox11/patches/patch-am     Sun Mar 06 11:40:21 2005 +0000
@@ -1,74 +1,95 @@
-$NetBSD: patch-am,v 1.1.1.1 2005/02/28 12:37:30 spz Exp $
+$NetBSD: patch-am,v 1.2 2005/03/06 11:40:21 spz Exp $
 
 --- src/normalform/IPv6RadixSet.hh.orig        2004-07-30 12:58:12.000000000 +0200
 +++ src/normalform/IPv6RadixSet.hh
-@@ -74,7 +74,8 @@ extern ip_v6word_t ipv6bits[];
+@@ -74,7 +74,12 @@ extern ip_v6word_t ipv6bits[];
  
  class IPv6RadixTree {
  public:
--   friend class Iterator {
++#if (__GNUC__ > 2)
 +   friend class Iterator;
 +   class Iterator {
++#else
+    friend class Iterator {
++#endif
     private:
        const IPv6RadixTree* last;
        const IPv6RadixTree* root;
-@@ -152,7 +153,8 @@ class IPv6RadixSet {
+@@ -152,7 +157,12 @@ class IPv6RadixSet {
  public:
     static bool compressedPrint;
  
--   friend class Iterator {
++#if (__GNUC__ > 2)
 +   friend class Iterator;
 +   class Iterator {
++#else
+    friend class Iterator {
++#endif
     private:
        IPv6RadixTree::Iterator itr;
        const IPv6RadixTree *now;     // points to current node during iteration
-@@ -163,7 +165,8 @@ public:
+@@ -163,7 +173,12 @@ public:
        bool next(ipv6_addr_t &_addr, u_int &_leng, ipv6_addr_t &rngs);
     };
  
--   friend class SortedIterator {
++#if (__GNUC__ > 2)
 +   friend class SortedIterator;
 +   class SortedIterator {
++#else
+    friend class SortedIterator {
++#endif
     private:
        class PrefixLNode : public ListNode {
        public:
-@@ -187,7 +190,8 @@ public:
+@@ -187,7 +202,12 @@ public:
        bool next(ipv6_addr_t &_addr, u_int &_leng, ipv6_addr_t &_rngs);
     };
  
--   friend class PrefixIterator {
++#if (__GNUC__ > 2)
 +   friend class PrefixIterator;
 +   class PrefixIterator {
++#else
+    friend class PrefixIterator {
++#endif
     private:
        IPv6RadixTree::Iterator itr;
        const IPv6RadixTree *current;
-@@ -204,7 +208,8 @@ public:
+@@ -204,7 +224,12 @@ public:
        bool next(ipv6_addr_t &_addr, u_int &_leng);
     };
  
--   friend class SortedPrefixIterator {
++#if (__GNUC__ > 2)
 +   friend class SortedPrefixIterator;
 +   class SortedPrefixIterator {
++#else
+    friend class SortedPrefixIterator {
++#endif
     private:
        class PrefixLNode : public ListNode {
        public:
-@@ -227,7 +232,8 @@ public:
+@@ -227,7 +252,12 @@ public:
        bool next(ipv6_addr_t &_addr, u_int &_leng);
     };
  
--   friend class PrefixRangeIterator {
++#if (__GNUC__ > 2)
 +   friend class PrefixRangeIterator;
 +   class PrefixRangeIterator {
++#else
+    friend class PrefixRangeIterator {
++#endif
     private:
        IPv6RadixTree::Iterator itr;
        const IPv6RadixTree *current;
-@@ -260,7 +266,8 @@ public:
+@@ -260,7 +290,12 @@ public:
  */
     };
  
--   friend class SortedPrefixRangeIterator {
++#if (__GNUC__ > 2)
 +   friend class SortedPrefixRangeIterator;
 +   class SortedPrefixRangeIterator {
++#else
+    friend class SortedPrefixRangeIterator {
++#endif
     private:
        class PrefixLNode : public ListNode {
        public:
diff -r a629ad909341 -r 44d2eda3f195 net/irrtoolset-nox11/patches/patch-an
--- a/net/irrtoolset-nox11/patches/patch-an     Sun Mar 06 11:12:24 2005 +0000
+++ b/net/irrtoolset-nox11/patches/patch-an     Sun Mar 06 11:40:21 2005 +0000
@@ -1,74 +1,95 @@
-$NetBSD: patch-an,v 1.1.1.1 2005/02/28 12:37:30 spz Exp $
+$NetBSD: patch-an,v 1.2 2005/03/06 11:40:21 spz Exp $
 
 --- src/normalform/RadixSet.hh.orig    2004-07-30 12:58:13.000000000 +0200
 +++ src/normalform/RadixSet.hh
-@@ -76,7 +76,8 @@ extern FixedSizeAllocator RadixTreeAlloc
+@@ -76,7 +76,12 @@ extern FixedSizeAllocator RadixTreeAlloc
  
  class RadixTree {
  public:
--   friend class Iterator {
++#if (__GNUC__ > 2)
 +   friend class Iterator;
 +   class Iterator {
++#else
+    friend class Iterator {
++#endif
     private:
        const RadixTree* last;
        const RadixTree* root;
-@@ -155,7 +156,8 @@ class RadixSet {
+@@ -155,7 +160,12 @@ class RadixSet {
  public:
     static bool compressedPrint;
  
--   friend class Iterator {
++#if (__GNUC__ > 2)
 +   friend class Iterator;
 +   class Iterator {
++#else
+    friend class Iterator {
++#endif
     private:
        RadixTree::Iterator itr;
        const RadixTree *now;     // points to current node during iteration
-@@ -166,7 +168,8 @@ public:
+@@ -166,7 +176,12 @@ public:
        bool next(u_int &_addr, u_int &_leng, u_int64_t &rngs);
     };
  
--   friend class SortedIterator {
++#if (__GNUC__ > 2)
 +   friend class SortedIterator;
 +   class SortedIterator {
++#else
+    friend class SortedIterator {
++#endif
     private:
        class PrefixLNode : public ListNode {
        public:
-@@ -189,7 +192,8 @@ public:
+@@ -189,7 +204,12 @@ public:
        bool next(u_int &_addr, u_int &_leng, u_int64_t &_rngs);
     };
  
--   friend class PrefixIterator {
++#if (__GNUC__ > 2)
 +   friend class PrefixIterator;
 +   class PrefixIterator {
++#else
+    friend class PrefixIterator {
++#endif
     private:
        RadixTree::Iterator itr;
        const RadixTree *current;
-@@ -206,7 +210,8 @@ public:
+@@ -206,7 +226,12 @@ public:
        bool next(u_int &_addr, u_int &_leng);
     };
  
--   friend class SortedPrefixIterator {
++#if (__GNUC__ > 2)
 +   friend class SortedPrefixIterator;
 +   class SortedPrefixIterator {
++#else
+    friend class SortedPrefixIterator {
++#endif
     private:
        class PrefixLNode : public ListNode {
        public:
-@@ -228,7 +233,8 @@ public:
+@@ -228,7 +253,12 @@ public:
        bool next(u_int &_addr, u_int &_leng);
     };
  
--   friend class PrefixRangeIterator {
++#if (__GNUC__ > 2)
 +   friend class PrefixRangeIterator;
 +   class PrefixRangeIterator {
++#else
+    friend class PrefixRangeIterator {
++#endif
     private:
        RadixTree::Iterator itr;
        const RadixTree *current;
-@@ -259,7 +265,8 @@ public:
+@@ -259,7 +289,12 @@ public:
        }
     };
  
--   friend class SortedPrefixRangeIterator {
++#if (__GNUC__ > 2)
 +   friend class SortedPrefixRangeIterator;
 +   class SortedPrefixRangeIterator {
++#else
+    friend class SortedPrefixRangeIterator {
++#endif
     private:
        class PrefixLNode : public ListNode {
        public:
diff -r a629ad909341 -r 44d2eda3f195 net/irrtoolset-nox11/patches/patch-ba
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/irrtoolset-nox11/patches/patch-ba     Sun Mar 06 11:40:21 2005 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-ba,v 1.1 2005/03/06 11:40:21 spz Exp $
+
+--- src/rpsl/rpsl/prefix.hh.orig       2004-07-30 12:58:14.000000000 +0200
++++ src/rpsl/rpsl/prefix.hh
+@@ -59,7 +59,11 @@
+ #include <sys/types.h>
+ #include <vector>
+ #include <sstream>
++#if (__GNUC__ > 2)
+ #include <ostream>
++#else
++#include <ostream.h>
++#endif
+ 
+ typedef unsigned long long int       ip_v6word_t;
+ 
diff -r a629ad909341 -r 44d2eda3f195 net/irrtoolset-nox11/patches/patch-bb
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/irrtoolset-nox11/patches/patch-bb     Sun Mar 06 11:40:21 2005 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-bb,v 1.1 2005/03/06 11:40:21 spz Exp $
+
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc Note import of Sazanami font 20040618 and removal ...
Next by Date: [pkgsrc/trunk]: pkgsrc/meta-pkgs/kde3 $PKG_SYSCONFDIR support from Jeremy C. ...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc Note import of Sazanami font 20040618 and removal ...
Next by Thread: [pkgsrc/trunk]: pkgsrc/meta-pkgs/kde3 $PKG_SYSCONFDIR support from Jeremy C. ...
Indexes:
Home | Main Index | Thread Index | Old Index