Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id A4DEB7A1BC for ; Sun, 28 May 2017 01:00:22 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 4C89A84DBB; Sun, 28 May 2017 01:00:22 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id CE66A84CFB for ; Sun, 28 May 2017 01:00:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id oZEHnqRJiAFb for ; Sun, 28 May 2017 01:00:21 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 2C66C84CE1 for ; Sun, 28 May 2017 01:00:21 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 231EAFBE4; Sun, 28 May 2017 01:00:21 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1495933221220740" MIME-Version: 1.0 Date: Sun, 28 May 2017 01:00:21 +0000 From: "Maya Rashish" Subject: CVS commit: pkgsrc/lang/gcc48 To: pkgsrc-changes@NetBSD.org Reply-To: maya@netbsd.org X-Mailer: log_accum Message-Id: <20170528010021.231EAFBE4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1495933221220740 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: maya Date: Sun May 28 01:00:20 UTC 2017 Modified Files: pkgsrc/lang/gcc48: Makefile distinfo pkgsrc/lang/gcc48/patches: patch-gcc_config_netbsd.h Added Files: pkgsrc/lang/gcc48/patches: patch-libstdc++-v3_include_bits_basic__string.h Log Message: gcc48: always link libgcc on netbsd (GCC r248037, applied to GCC 8 and above - thanks Krister Walfridsson) libstdc++: if it thinks vswprintf is broken, don't block the entire definition of to_string, just that of to_wstring. backport of GCC r223830 already applied to GCC 4.9. this applies to netbsd-6-0. Doesn't fix any build I wanted to fix, but it does get the build of LLVM4.x further on netbsd-6-0. maybe there's an odd package that could benefit from it. bump PKGREVISION. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 pkgsrc/lang/gcc48/Makefile cvs rdiff -u -r1.33 -r1.34 pkgsrc/lang/gcc48/distinfo cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/gcc48/patches/patch-gcc_config_netbsd.h cvs rdiff -u -r0 -r1.1 \ pkgsrc/lang/gcc48/patches/patch-libstdc++-v3_include_bits_basic__string.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1495933221220740 Content-Disposition: inline Content-Length: 5200 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/lang/gcc48/Makefile diff -u pkgsrc/lang/gcc48/Makefile:1.30 pkgsrc/lang/gcc48/Makefile:1.31 --- pkgsrc/lang/gcc48/Makefile:1.30 Thu Sep 15 17:56:23 2016 +++ pkgsrc/lang/gcc48/Makefile Sun May 28 01:00:20 2017 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2016/09/15 17:56:23 maya Exp $ +# $NetBSD: Makefile,v 1.31 2017/05/28 01:00:20 maya Exp $ GCC_PKGNAME= gcc48 .include "version.mk" @@ -8,6 +8,7 @@ PKGNAME= ${GCC_PKGNAME}-${GCC48_DIST_VER ## When bumping the PKGREVISION of this package the PKGREVISION of ## lang/gcc48-libs needs to be bump to be at least 1 more than the ## PKGREVISION of this package! +PKGREVISION= 1 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC48_DIST_VERSION}/} EXTRACT_SUFX= .tar.bz2 Index: pkgsrc/lang/gcc48/distinfo diff -u pkgsrc/lang/gcc48/distinfo:1.33 pkgsrc/lang/gcc48/distinfo:1.34 --- pkgsrc/lang/gcc48/distinfo:1.33 Sun Jan 22 12:22:46 2017 +++ pkgsrc/lang/gcc48/distinfo Sun May 28 01:00:20 2017 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.33 2017/01/22 12:22:46 maya Exp $ +$NetBSD: distinfo,v 1.34 2017/05/28 01:00:20 maya Exp $ SHA1 (ecj-4.5.jar) = 58c1d79c64c8cd718550f32a932ccfde8d1e6449 RMD160 (ecj-4.5.jar) = d3f4da657f086b6423f74e93f001132f4855368a @@ -40,7 +40,7 @@ SHA1 (patch-gcc_config_i386_dragonfly.h) SHA1 (patch-gcc_config_i386_openbsd.h) = df5b85b5957392138f99085bd8ebeb923e37e9e7 SHA1 (patch-gcc_config_i386_openbsdelf.h) = 74498a1bd7c339c90b847740d3c474ad3ca4a956 SHA1 (patch-gcc_config_netbsd-stdint.h) = 025fc883101a187e84ed4c0772406720d645d550 -SHA1 (patch-gcc_config_netbsd.h) = 086b593cf9f05e654df9e1a527485ca727ec44cc +SHA1 (patch-gcc_config_netbsd.h) = 922088494d517fdde499d599b442a9b1cf8445a4 SHA1 (patch-gcc_config_openbsd-libpthread.h) = 5043cf383fb68ff37b0cae22e61a97e26cff899e SHA1 (patch-gcc_config_openbsd.h) = 0090d48281c4973a18e8a70b2be9d2e999cca0a6 SHA1 (patch-gcc_config_openbsd.opt) = 08b01bc4d7e171c3ee2ce5638a5859cff50c8ff8 @@ -95,5 +95,6 @@ SHA1 (patch-libstdc++-v3_config_os_bsd_n SHA1 (patch-libstdc++-v3_config_os_bsd_openbsd_os__defines.h) = f899b6ddfabdef82ecee3562a946cecd1b995dd0 SHA1 (patch-libstdc++-v3_configure) = 3821275fa698221d7665ea3c98b0a24f33954a5a SHA1 (patch-libstdc++-v3_configure.host) = 7426ea4a9735e5f886f4a3ffb4a9ba62734178c4 +SHA1 (patch-libstdc++-v3_include_bits_basic__string.h) = 7bcae0e92f444b65871c2f3c413e4c6f7d4e10a0 SHA1 (patch-libstdc++-v3_libsupc++_unwind-cxx.h) = 9784bfa4323f8498b36565d0fea28fce69ffdbb1 SHA1 (patch-ltmain.sh) = 86c1511bd8ff133ba208ec8ec7e206d77ce85d01 Index: pkgsrc/lang/gcc48/patches/patch-gcc_config_netbsd.h diff -u pkgsrc/lang/gcc48/patches/patch-gcc_config_netbsd.h:1.1 pkgsrc/lang/gcc48/patches/patch-gcc_config_netbsd.h:1.2 --- pkgsrc/lang/gcc48/patches/patch-gcc_config_netbsd.h:1.1 Sun Sep 4 18:29:39 2016 +++ pkgsrc/lang/gcc48/patches/patch-gcc_config_netbsd.h Sun May 28 01:00:20 2017 @@ -1,6 +1,7 @@ -$NetBSD: patch-gcc_config_netbsd.h,v 1.1 2016/09/04 18:29:39 maya Exp $ +$NetBSD: patch-gcc_config_netbsd.h,v 1.2 2017/05/28 01:00:20 maya Exp $ when using shared, link against libc. +always link against libgcc. --- gcc/config/netbsd.h.orig 2013-01-10 20:38:27.000000000 +0000 +++ gcc/config/netbsd.h @@ -20,3 +21,12 @@ when using shared, link against libc. %{!shared: \ %{!symbolic: \ %{!p: \ +@@ -133,7 +135,7 @@ along with GCC; see the file COPYING3. + %{p: -lgcc_p} \ + %{pg: -lgcc_p}}" + #else +-#define NETBSD_LIBGCC_SPEC "%{!shared:%{!symbolic: -lgcc}}" ++#define NETBSD_LIBGCC_SPEC "-lgcc" + #endif + + #undef LIBGCC_SPEC Added files: Index: pkgsrc/lang/gcc48/patches/patch-libstdc++-v3_include_bits_basic__string.h diff -u /dev/null pkgsrc/lang/gcc48/patches/patch-libstdc++-v3_include_bits_basic__string.h:1.1 --- /dev/null Sun May 28 01:00:21 2017 +++ pkgsrc/lang/gcc48/patches/patch-libstdc++-v3_include_bits_basic__string.h Sun May 28 01:00:20 2017 @@ -0,0 +1,34 @@ +$NetBSD: patch-libstdc++-v3_include_bits_basic__string.h,v 1.1 2017/05/28 01:00:20 maya Exp $ + +Backport of r223830 +Don't hide all of to_string if _GLIBCXX_HAVE_BROKEN_VSWPRINTF +only to_wstring (Applies to NetBSD-6-0) + +--- libstdc++-v3/include/bits/basic_string.h.orig 2013-05-15 22:00:48.000000000 +0000 ++++ libstdc++-v3/include/bits/basic_string.h +@@ -2809,8 +2809,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION + _GLIBCXX_END_NAMESPACE_VERSION + } // namespace + +-#if ((__cplusplus >= 201103L) && defined(_GLIBCXX_USE_C99) \ +- && !defined(_GLIBCXX_HAVE_BROKEN_VSWPRINTF)) ++#if ((__cplusplus >= 201103L) && defined(_GLIBCXX_USE_C99)) + + #include + +@@ -2961,6 +2960,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION + { return __gnu_cxx::__stoa(&std::wcstold, "stold", __str.c_str(), __idx); } + + // DR 1261. ++#ifndef _GLIBCXX_HAVE_BROKEN_VSWPRINTF + inline wstring + to_wstring(int __val) + { return __gnu_cxx::__to_xstring(&std::vswprintf, 4 * sizeof(int), +@@ -3021,6 +3021,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION + return __gnu_cxx::__to_xstring(&std::vswprintf, __n, + L"%Lf", __val); + } ++#endif // _GLIBCXX_HAVE_BROKEN_VSWPRINTF + #endif + + _GLIBCXX_END_NAMESPACE_VERSION --_----------=_1495933221220740--