CVS commit: pkgsrc/lang/gcc7

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Fri May 12 18:10:57 UTC 2017

Modified Files:
        pkgsrc/lang/gcc7: distinfo
        pkgsrc/lang/gcc7/patches: patch-libstdc++-v3_libsupc++_new__opa.cc

Log Message:
Restrict patch to specific circumstances on SunOS.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/gcc7/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/lang/gcc7/patches/patch-libstdc++-v3_libsupc++_new__opa.cc

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

Modified files:

Index: pkgsrc/lang/gcc7/distinfo
diff -u pkgsrc/lang/gcc7/distinfo:1.3 pkgsrc/lang/gcc7/distinfo:1.4
--- pkgsrc/lang/gcc7/distinfo:1.3       Wed May 10 15:00:09 2017
+++ pkgsrc/lang/gcc7/distinfo   Fri May 12 18:10:56 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2017/05/10 15:00:09 jperkin Exp $
+$NetBSD: distinfo,v 1.4 2017/05/12 18:10:56 jperkin Exp $
 
 SHA1 (gcc-7.1.0.tar.bz2) = 9f1e907f27eadefe7d5f7567c09e17805d9c8837
 RMD160 (gcc-7.1.0.tar.bz2) = a228dc45a09eda91b1a201d234f9013b3009b461
@@ -35,5 +35,5 @@ SHA1 (patch-libsanitizer_configure.tgt) 
 SHA1 (patch-libstdc++-v3_config_os_bsd_netbsd_ctype__base.h) = 014d442c885b9c51d1a4af05205279c274a9559d
 SHA1 (patch-libstdc++-v3_config_os_bsd_netbsd_ctype__configure__char.cc) = 06bba6da02344f76c26eed765a7cb022c035994e
 SHA1 (patch-libstdc++-v3_config_os_bsd_netbsd_ctype__inline.h) = 626fc1f9c035ac5cef30a92d525af4e778835ebf
-SHA1 (patch-libstdc++-v3_libsupc++_new__opa.cc) = 4f5c5e1a2975d13b52736328dcdd6a8bcd3b3b73
+SHA1 (patch-libstdc++-v3_libsupc++_new__opa.cc) = c23679d5bd18ba82c578eb2909a8055bf37c34cd
 SHA1 (patch-libstdc++-v3_libsupc++_unwind-cxx.h) = 9784bfa4323f8498b36565d0fea28fce69ffdbb1

Index: pkgsrc/lang/gcc7/patches/patch-libstdc++-v3_libsupc++_new__opa.cc
diff -u pkgsrc/lang/gcc7/patches/patch-libstdc++-v3_libsupc++_new__opa.cc:1.1 pkgsrc/lang/gcc7/patches/patch-libstdc++-v3_libsupc++_new__opa.cc:1.2
--- pkgsrc/lang/gcc7/patches/patch-libstdc++-v3_libsupc++_new__opa.cc:1.1       Wed May 10 15:00:09 2017
+++ pkgsrc/lang/gcc7/patches/patch-libstdc++-v3_libsupc++_new__opa.cc   Fri May 12 18:10:56 2017
@@ -1,15 +1,17 @@
-$NetBSD: patch-libstdc++-v3_libsupc++_new__opa.cc,v 1.1 2017/05/10 15:00:09 jperkin Exp $
+$NetBSD: patch-libstdc++-v3_libsupc++_new__opa.cc,v 1.2 2017/05/12 18:10:56 jperkin Exp $
 
-Ensure we can find std::aligned_alloc if using it.
+Ensure we can find SunOS std::aligned_alloc if using it.
 
 --- libstdc++-v3/libsupc++/new_opa.cc.orig     2017-01-26 14:30:45.000000000 +0000
 +++ libstdc++-v3/libsupc++/new_opa.cc
-@@ -82,6 +82,8 @@ aligned_alloc (std::size_t al, std::size
-   return aligned_ptr;
- }
- #endif
-+#else
-+using std::aligned_alloc;
- #endif
+@@ -31,6 +31,10 @@
+ using std::new_handler;
+ using std::bad_alloc;
  
- _GLIBCXX_WEAK_DEFINITION void *
++#if defined(__sun) && _GLIBCXX_HAVE_ALIGNED_ALLOC
++using std::aligned_alloc;
++#endif
++
+ #if !_GLIBCXX_HAVE_ALIGNED_ALLOC
+ #if _GLIBCXX_HAVE__ALIGNED_MALLOC
+ #define aligned_alloc(al,sz) _aligned_malloc(sz,al)