CVS commit: pkgsrc/devel/pstreams

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sun Jul  9 14:56:58 UTC 2023

Modified Files:
        pkgsrc/devel/pstreams: distinfo
        pkgsrc/devel/pstreams/patches: patch-Makefile
Added Files:
        pkgsrc/devel/pstreams/patches: patch-pstream.h

Log Message:
pstreams: Fix for older C++ compilers.

While here, honour CFLAGS when building tests.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/pstreams/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/pstreams/patches/patch-Makefile
cvs rdiff -u -r0 -r1.3 pkgsrc/devel/pstreams/patches/patch-pstream.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/pstreams/distinfo
diff -u pkgsrc/devel/pstreams/distinfo:1.7 pkgsrc/devel/pstreams/distinfo:1.8
--- pkgsrc/devel/pstreams/distinfo:1.7  Tue Feb 15 10:28:38 2022
+++ pkgsrc/devel/pstreams/distinfo      Sun Jul  9 14:56:58 2023
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.7 2022/02/15 10:28:38 nros Exp $
+$NetBSD: distinfo,v 1.8 2023/07/09 14:56:58 nia Exp $
 
 BLAKE2s (pstreams-1.0.3.tar.gz) = e4f1b09ca0bebc064ac7f0c177b4c821cff8c29721d1f680204ecfcf2c0adc8e
 SHA512 (pstreams-1.0.3.tar.gz) = 5d23a98dacfe307ffaad40b72b70c62d1854fdf08e3f5cffb338060e0afe7c8d6fbddb89c1de38821914e35a88a1cbbda042fec156e17176774c823e9a526a74
 Size (pstreams-1.0.3.tar.gz) = 69119 bytes
-SHA1 (patch-Makefile) = 95a98894b81bf72890c4060a849e626fe9472306
+SHA1 (patch-Makefile) = 54b48dbf6cb7282def12cadfe48f71eeece459db
+SHA1 (patch-pstream.h) = 36c4ada4ef3463dfca589a1a37d992f496b29ba3

Index: pkgsrc/devel/pstreams/patches/patch-Makefile
diff -u pkgsrc/devel/pstreams/patches/patch-Makefile:1.3 pkgsrc/devel/pstreams/patches/patch-Makefile:1.4
--- pkgsrc/devel/pstreams/patches/patch-Makefile:1.3    Tue Feb 15 10:28:38 2022
+++ pkgsrc/devel/pstreams/patches/patch-Makefile        Sun Jul  9 14:56:58 2023
@@ -1,11 +1,21 @@
-$NetBSD: patch-Makefile,v 1.3 2022/02/15 10:28:38 nros Exp $
+$NetBSD: patch-Makefile,v 1.4 2023/07/09 14:56:58 nia Exp $
 
 * disable documents generation
 * BSD install does not support -v option
 
 --- Makefile.orig      2020-06-10 20:17:32.000000000 +0000
 +++ Makefile
-@@ -18,7 +18,7 @@ CXXFLAGS=$(CFLAGS) -std=c++98 -Woverload
+@@ -9,16 +9,15 @@
+ 
+ # TODO configure script (allow doxygenating of EVISCERATE functions)
+ 
+-OPTIM= -O1 -g3
+ EXTRA_CXXFLAGS=
+ 
+-CFLAGS=-pedantic -Wall -Wextra -Wpointer-arith -Wcast-qual -Wcast-align -Wredundant-decls -Wshadow $(OPTIM)
++CFLAGS+=-pedantic -Wall -Wextra -Wpointer-arith -Wcast-qual -Wcast-align -Wredundant-decls -Wshadow $(OPTIM)
+ CXXFLAGS=$(CFLAGS) -std=c++98 -Woverloaded-virtual
+ 
  prefix = /usr/local
  includedir = $(prefix)/include
  INSTALL = install

Added files:

Index: pkgsrc/devel/pstreams/patches/patch-pstream.h
diff -u /dev/null pkgsrc/devel/pstreams/patches/patch-pstream.h:1.3
--- /dev/null   Sun Jul  9 14:56:58 2023
+++ pkgsrc/devel/pstreams/patches/patch-pstream.h       Sun Jul  9 14:56:58 2023
@@ -0,0 +1,23 @@
+$NetBSD: patch-pstream.h,v 1.3 2023/07/09 14:56:58 nia Exp $
+
+Fix building with older C++ compilers which do not understand
+__has_cpp_attribute.
+
+--- pstream.h.orig     2020-06-10 19:30:50.000000000 +0000
++++ pstream.h
+@@ -1642,10 +1642,12 @@ namespace redi
+    *  No longer used.
+    */
+   template <typename C, typename T>
+-#if __cplusplus >= 201402L && __has_cpp_attribute(deprecated)
+-    [[deprecated]]
+-#elif __GNUC__
++#if defined(__GNUC__)
+     __attribute__((deprecated))
++#elif defined(__cplusplus) && __cplusplus >= 201402L
++#if __has_cpp_attribute(deprecated)
++    [[deprecated]]
++#endif
+ #endif
+     inline void
+     basic_pstreambuf<C,T>::init_rbuffers()