[pkgsrc/trunk]: pkgsrc/devel/sfio Fix build with gcc-4.5.

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/devel/sfio Fix build with gcc-4.5.
From: wiz <wiz%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 11:42:03 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/8133da5b1741
branches:  trunk
changeset: 597311:8133da5b1741
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Mon Dec 19 14:19:43 2011 +0000

description:
Fix build with gcc-4.5.

diffstat:

 devel/sfio/distinfo                                            |  11 ++++-
 devel/sfio/patches/patch-ad                                    |  12 ++++--
 devel/sfio/patches/patch-ae                                    |  20 +++++++---
 devel/sfio/patches/patch-src_lib_sfio_Sfio__dc_sfdcfilter.c    |  18 +++++++++
 devel/sfio/patches/patch-src_lib_sfio_Sfio__dc_sfdcseekable.c  |  18 +++++++++
 devel/sfio/patches/patch-src_lib_sfio_Sfio__dc_sfdcsubstream.c |  18 +++++++++
 devel/sfio/patches/patch-src_lib_sfio_Sfio__dc_sfdctee.c       |  18 +++++++++
 devel/sfio/patches/patch-src_lib_sfio_Sfio__dc_sfdcunion.c     |  18 +++++++++
 8 files changed, 120 insertions(+), 13 deletions(-)

diffs (208 lines):

diff -r 6bc02f001e46 -r 8133da5b1741 devel/sfio/distinfo
--- a/devel/sfio/distinfo       Mon Dec 19 13:58:33 2011 +0000
+++ b/devel/sfio/distinfo       Mon Dec 19 14:19:43 2011 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2011/10/03 00:07:31 dholland Exp $
+$NetBSD: distinfo,v 1.8 2011/12/19 14:19:43 wiz Exp $
 
 SHA1 (sfio_1999.src.unix.cpio) = 6fd3a711ca8f95190c0859934f57a66d02c842a4
 RMD160 (sfio_1999.src.unix.cpio) = 379148273c9979f7a5a921a338465b7579a6ac5e
@@ -6,8 +6,8 @@
 SHA1 (patch-aa) = 514aafe5eb5f97150742efa6a5b51644bf485bda
 SHA1 (patch-ab) = 184497c28da9db978c2b384d3be526d28e3ebae0
 SHA1 (patch-ac) = 0e3b0aae65393ce98fd086ec593dd73e2b41c283
-SHA1 (patch-ad) = 4298da6e3778890f152c897d2da2849944f4eef3
-SHA1 (patch-ae) = 807cd4fc112fd439eb3431da6ae2b0dc7c7a38b4
+SHA1 (patch-ad) = 2e144ceabe9652e9acac8d08f6cf6ce8433425e6
+SHA1 (patch-ae) = 545addaf670f917f71fe71337b0d267be4debc70
 SHA1 (patch-af) = 4cdd35605fd7412fc3281577227d3e0da7dddfb9
 SHA1 (patch-ag) = ffa7233bcb32efd393a449bfcfb6e2696e76f9d6
 SHA1 (patch-ah) = 02d80635de65a6513a222be69643e9925a170d17
@@ -16,3 +16,8 @@
 SHA1 (patch-ak) = 42d8dd1a5518b558f8875f9fb60f7e80b9c0fd4b
 SHA1 (patch-al) = d11738f33e3382664e8dc57501a062a0df948083
 SHA1 (patch-src_lib_sfio_Sfio__dc_sfcdio_c) = 9085c7e69de27a2ae72200015afc578d13237221
+SHA1 (patch-src_lib_sfio_Sfio__dc_sfdcfilter.c) = e547e614dd91876a6e09c12852c4c7700871afd1
+SHA1 (patch-src_lib_sfio_Sfio__dc_sfdcseekable.c) = daa5b79246462fe474dc72b4dba323d4af2f648d
+SHA1 (patch-src_lib_sfio_Sfio__dc_sfdcsubstream.c) = 57acce973b885a97ef783cab5ffafd07666fca61
+SHA1 (patch-src_lib_sfio_Sfio__dc_sfdctee.c) = a21856a2c6db519e5dda508c7dd3358aef5ffe13
+SHA1 (patch-src_lib_sfio_Sfio__dc_sfdcunion.c) = 95c2113db9c1ff1c9ee7c9388a1324033a7fe697
diff -r 6bc02f001e46 -r 8133da5b1741 devel/sfio/patches/patch-ad
--- a/devel/sfio/patches/patch-ad       Mon Dec 19 13:58:33 2011 +0000
+++ b/devel/sfio/patches/patch-ad       Mon Dec 19 14:19:43 2011 +0000
@@ -1,10 +1,12 @@
-$NetBSD: patch-ad,v 1.2 2000/08/13 17:42:24 itojun Exp $
+$NetBSD: patch-ad,v 1.3 2011/12/19 14:19:43 wiz Exp $
 
 Avoid a compiler warning.
 
---- src/lib/sfio/sfvscanf.c.orig       Sat May 29 04:19:30 1999
-+++ src/lib/sfio/sfvscanf.c    Mon Aug 14 01:56:07 2000
-@@ -642,7 +642,3 @@
+--- src/lib/sfio/sfvscanf.c.orig       1999-05-28 19:19:30.000000000 +0000
++++ src/lib/sfio/sfvscanf.c
+@@ -640,11 +640,7 @@ loop_fmt :
+                       {       n_assign += 1;
+ 
                                if(fmt == 'p')
 -#if _more_void_int
 -                                      *((Void_t**)value) = (Void_t*)((ulong)argv.lu);
@@ -13,3 +15,5 @@
 -#endif
 +                                      (void) memcpy(value, &argv.lu, sizeof(value));
  #if !_ast_intmax_long
+                               else if(FMTCMP(size,Sflong_t,Sflong_t))
+                                       *((Sflong_t*)value) = argv.ll;
diff -r 6bc02f001e46 -r 8133da5b1741 devel/sfio/patches/patch-ae
--- a/devel/sfio/patches/patch-ae       Mon Dec 19 13:58:33 2011 +0000
+++ b/devel/sfio/patches/patch-ae       Mon Dec 19 14:19:43 2011 +0000
@@ -1,17 +1,23 @@
-$NetBSD: patch-ae,v 1.3 2000/08/13 17:42:24 itojun Exp $
+$NetBSD: patch-ae,v 1.4 2011/12/19 14:19:43 wiz Exp $
 
 Avoid compiler warning.
 
---- src/lib/sfio/sfwr.c.orig   Fri Jul 30 23:58:33 1999
-+++ src/lib/sfio/sfwr.c        Mon Aug 14 01:58:54 2000
-@@ -16,4 +16,5 @@
+--- src/lib/sfio/sfwr.c.orig   1999-07-30 14:58:33.000000000 +0000
++++ src/lib/sfio/sfwr.c
+@@ -14,8 +14,9 @@ Sfio_t*              f;
+ reg char*     buf;
+ reg size_t    n;
  #endif
 -{     reg char        *sp, *wbuf, *endbuf;
 +{     reg char        *wbuf, *endbuf;
        reg ssize_t     s, w, wr;
 +      char            *sp;
  
-@@ -32,3 +33,6 @@
+       s = w = 0;
+       wbuf = buf;
+@@ -30,10 +31,14 @@ reg size_t n;
+                       sp = buf+1;
+                       if(buf[0] == 0 && buf[_Sfpage-1] == 0)
                        {       /* check byte at a time until int-aligned */
 -                              while(((ulong)sp)%sizeof(int))
 +                              Sfulong_t       dumbo;
@@ -19,7 +25,9 @@
 +                              (void) memcpy(&dumbo, &sp, sizeof(dumbo));
 +                              while(dumbo % sizeof(int) != 0)
                                {       if(*sp != 0)
-@@ -36,2 +40,3 @@
+                                               goto chk_hole;
                                        sp += 1;
 +                                      (void) memcpy(&dumbo, &sp, sizeof(dumbo));
                                }
+ 
+                               /* check using int to speed up */
diff -r 6bc02f001e46 -r 8133da5b1741 devel/sfio/patches/patch-src_lib_sfio_Sfio__dc_sfdcfilter.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/sfio/patches/patch-src_lib_sfio_Sfio__dc_sfdcfilter.c       Mon Dec 19 14:19:43 2011 +0000
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_lib_sfio_Sfio__dc_sfdcfilter.c,v 1.1 2011/12/19 14:19:43 wiz Exp $
+
+- use standard C
+
+--- src/lib/sfio/Sfio_dc/sfdcfilter.c.orig     1998-03-19 16:10:25.000000000 +0000
++++ src/lib/sfio/Sfio_dc/sfdcfilter.c
+@@ -103,9 +103,9 @@ Sfdisc_t*  disc;
+ 
+ /* on close, remove the discipline */
+ #if __STD_C
+-static filterexcept(Sfio_t* f, int type, Void_t* data, Sfdisc_t* disc)
++static int filterexcept(Sfio_t* f, int type, Void_t* data, Sfdisc_t* disc)
+ #else
+-static filterexcept(f,type,data,disc)
++static int filterexcept(f,type,data,disc)
+ Sfio_t*               f;
+ int           type;
+ Void_t*               data;
diff -r 6bc02f001e46 -r 8133da5b1741 devel/sfio/patches/patch-src_lib_sfio_Sfio__dc_sfdcseekable.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/sfio/patches/patch-src_lib_sfio_Sfio__dc_sfdcseekable.c     Mon Dec 19 14:19:43 2011 +0000
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_lib_sfio_Sfio__dc_sfdcseekable.c,v 1.1 2011/12/19 14:19:43 wiz Exp $
+
+- use standard C
+
+--- src/lib/sfio/Sfio_dc/sfdcseekable.c.orig   1998-03-19 16:11:36.000000000 +0000
++++ src/lib/sfio/Sfio_dc/sfdcseekable.c
+@@ -126,9 +126,9 @@ Sfdisc_t*  disc;
+ 
+ /* on close, remove the discipline */
+ #if __STD_C
+-static skexcept(Sfio_t* f, int type, Void_t* data, Sfdisc_t* disc)
++static int skexcept(Sfio_t* f, int type, Void_t* data, Sfdisc_t* disc)
+ #else
+-static skexcept(f,type,data,disc)
++static int skexcept(f,type,data,disc)
+ Sfio_t*               f;
+ int           type;
+ Void_t*               data;
diff -r 6bc02f001e46 -r 8133da5b1741 devel/sfio/patches/patch-src_lib_sfio_Sfio__dc_sfdcsubstream.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/sfio/patches/patch-src_lib_sfio_Sfio__dc_sfdcsubstream.c    Mon Dec 19 14:19:43 2011 +0000
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_lib_sfio_Sfio__dc_sfdcsubstream.c,v 1.1 2011/12/19 14:19:43 wiz Exp $
+
+- use standard C
+
+--- src/lib/sfio/Sfio_dc/sfdcsubstream.c.orig  1999-06-01 15:21:56.000000000 +0000
++++ src/lib/sfio/Sfio_dc/sfdcsubstream.c
+@@ -133,9 +133,9 @@ Sfdisc_t*  disc;
+ }
+ 
+ #if __STD_C
+-static streamexcept(Sfio_t* f, int type, Void_t* data, Sfdisc_t* disc)
++static int streamexcept(Sfio_t* f, int type, Void_t* data, Sfdisc_t* disc)
+ #else
+-static streamexcept(f, type, data, disc)
++static int streamexcept(f, type, data, disc)
+ Sfio_t*               f;
+ int           type;
+ Void_t*               data;
diff -r 6bc02f001e46 -r 8133da5b1741 devel/sfio/patches/patch-src_lib_sfio_Sfio__dc_sfdctee.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/sfio/patches/patch-src_lib_sfio_Sfio__dc_sfdctee.c  Mon Dec 19 14:19:43 2011 +0000
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_lib_sfio_Sfio__dc_sfdctee.c,v 1.1 2011/12/19 14:19:43 wiz Exp $
+
+- use standard C
+
+--- src/lib/sfio/Sfio_dc/sfdctee.c.orig        1999-06-01 15:22:34.000000000 +0000
++++ src/lib/sfio/Sfio_dc/sfdctee.c
+@@ -37,9 +37,9 @@ Sfdisc_t*    disc;   /* the tee discipline */
+ 
+ /* on close, remove the discipline */
+ #if __STD_C
+-static teeexcept(Sfio_t* f, int type, Void_t* data, Sfdisc_t* disc)
++static int teeexcept(Sfio_t* f, int type, Void_t* data, Sfdisc_t* disc)
+ #else
+-static teeexcept(f,type,data,disc)
++static int teeexcept(f,type,data,disc)
+ Sfio_t*               f;
+ int           type;
+ Void_t*               data;
diff -r 6bc02f001e46 -r 8133da5b1741 devel/sfio/patches/patch-src_lib_sfio_Sfio__dc_sfdcunion.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/sfio/patches/patch-src_lib_sfio_Sfio__dc_sfdcunion.c        Mon Dec 19 14:19:43 2011 +0000
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_lib_sfio_Sfio__dc_sfdcunion.c,v 1.1 2011/12/19 14:19:43 wiz Exp $
+
+- use standard C
+
+--- src/lib/sfio/Sfio_dc/sfdcunion.c.orig      1998-03-19 15:04:05.000000000 +0000
++++ src/lib/sfio/Sfio_dc/sfdcunion.c
+@@ -124,9 +124,9 @@ Sfdisc_t*      disc;
+ 
+ /* on close, remove the discipline */
+ #if __STD_C
+-static unexcept(Sfio_t* f, int type, Void_t* data, Sfdisc_t* disc)
++static int unexcept(Sfio_t* f, int type, Void_t* data, Sfdisc_t* disc)
+ #else
+-static unexcept(f,type,data,disc)
++static int unexcept(f,type,data,disc)
+ Sfio_t*               f;
+ int           type;
+ Void_t*               data;
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc Updated net/yaz to 3.0.49
Next by Date: [pkgsrc/trunk]: pkgsrc/devel New packages: lua-lrexlib{,-{posix,pcre,onig}}
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc Updated net/yaz to 3.0.49
Next by Thread: [pkgsrc/trunk]: pkgsrc/devel New packages: lua-lrexlib{,-{posix,pcre,onig}}
Indexes:
Home | Main Index | Thread Index | Old Index