summaryrefslogtreecommitdiff
path: root/devel/poco/patches/patch-build_config_SunOS-GCC
diff options
context:
space:
mode:
Diffstat (limited to 'devel/poco/patches/patch-build_config_SunOS-GCC')
-rw-r--r--devel/poco/patches/patch-build_config_SunOS-GCC21
1 files changed, 17 insertions, 4 deletions
diff --git a/devel/poco/patches/patch-build_config_SunOS-GCC b/devel/poco/patches/patch-build_config_SunOS-GCC
index ebe3a4cd432..1238d94945e 100644
--- a/devel/poco/patches/patch-build_config_SunOS-GCC
+++ b/devel/poco/patches/patch-build_config_SunOS-GCC
@@ -1,7 +1,7 @@
-$NetBSD: patch-build_config_SunOS-GCC,v 1.2 2012/06/26 12:33:43 fhajny Exp $
+$NetBSD: patch-build_config_SunOS-GCC,v 1.3 2012/07/29 11:26:54 fhajny Exp $
-_XOPEN_SOURCE=600 or higher is needed on SunOS and GCC>=4.6.
-Fix missing rpath on SunOS.
+Resolve a conflict on SunOS, where GCC>=4.6 will force C99 with C++
+and require _XOPEN_SOURCE=600, whereas GCC<4.6 will reject C99 with C++.
--- build/config/SunOS-GCC.orig 2011-09-24 08:06:59.000000000 +0000
+++ build/config/SunOS-GCC
@@ -21,6 +21,8 @@ LINK = $(CXX)
@@ -13,6 +13,19 @@ Fix missing rpath on SunOS.
SHLIBLN = $(POCO_BASE)/build/script/shlibln
STRIP = strip
DEP = $(POCO_BASE)/build/script/makedepend.gcc
+@@ -38,10 +40,10 @@ SHAREDLIBLINKEXT = .so
+ #
+ # Compiler and Linker Flags
+ #
+-CFLAGS =
++CFLAGS = -D_XOPEN_SOURCE=500
+ CFLAGS32 =
+ CFLAGS64 =
+-CXXFLAGS = -Wall -Wno-sign-compare
++CXXFLAGS = -Wall -Wno-sign-compare -D_XOPEN_SOURCE=$(XOPEN_SOURCE)
+ CXXFLAGS32 =
+ CXXFLAGS64 =
+ LINKFLAGS =
@@ -52,7 +54,7 @@ STATICOPT_CXX =
STATICOPT_LINK = -static
SHAREDOPT_CC = -fPIC
@@ -27,7 +40,7 @@ Fix missing rpath on SunOS.
# System Specific Flags
#
-SYSFLAGS = -D_XOPEN_SOURCE=500 -D_REENTRANT -D_THREAD_SAFE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
-+SYSFLAGS = -D_XOPEN_SOURCE=600 -D_REENTRANT -D_THREAD_SAFE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
++SYSFLAGS = -D_REENTRANT -D_THREAD_SAFE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
#
# System Specific Libraries