From a51e30b3c9e4dc2649e556613bdae9577405f044 Mon Sep 17 00:00:00 2001 From: pascal Date: Mon, 14 May 2012 23:39:39 +0000 Subject: [PATCH] Fix build with Brad's sysconf(3) diff, found by naddy@ in his bulk build. --- lang/gcc/4.6/Makefile | 4 ++-- .../4.6/patches/patch-libstdc++-v3_include_std_mutex | 12 ++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 lang/gcc/4.6/patches/patch-libstdc++-v3_include_std_mutex diff --git a/lang/gcc/4.6/Makefile b/lang/gcc/4.6/Makefile index 77491ddcb68..c7f26347667 100644 --- a/lang/gcc/4.6/Makefile +++ b/lang/gcc/4.6/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.25 2012/05/07 10:34:33 pascal Exp $ +# $OpenBSD: Makefile,v 1.26 2012/05/14 23:39:39 pascal Exp $ ONLY_FOR_ARCHS = amd64 i386 powerpc sparc sparc64 @@ -19,7 +19,7 @@ PKGNAME-ada = gnat-${FULL_PKGVERSION} PKGNAME-go = gccgo-${FULL_PKGVERSION} REVISION-main = 2 -REVISION-c++ = 3 +REVISION-c++ = 4 REVISION-estdc = 2 REVISION-f95 = 2 REVISION-java = 3 diff --git a/lang/gcc/4.6/patches/patch-libstdc++-v3_include_std_mutex b/lang/gcc/4.6/patches/patch-libstdc++-v3_include_std_mutex new file mode 100644 index 00000000000..490795946fe --- /dev/null +++ b/lang/gcc/4.6/patches/patch-libstdc++-v3_include_std_mutex @@ -0,0 +1,12 @@ +$OpenBSD: patch-libstdc++-v3_include_std_mutex,v 1.1 2012/05/14 23:39:39 pascal Exp $ +--- libstdc++-v3/include/std/mutex.orig Fri May 4 18:32:34 2012 ++++ libstdc++-v3/include/std/mutex Fri May 4 18:33:39 2012 +@@ -789,7 +789,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION + __get_once_mutex(); + #endif + +- extern "C" void __once_proxy(); ++ extern "C" void __once_proxy(void); + + /// call_once + template