Thu Feb 1 16:43:05 2018 UTC ()
poco: Support newer GCC and clang on SunOS.


(jperkin)
diff -r1.13 -r1.14 pkgsrc/devel/poco/Makefile.common
cvs diff -r1.13 -r1.14 pkgsrc/devel/poco/Makefile.common (expand / switch to unified diff)

--- pkgsrc/devel/poco/Makefile.common 2016/02/25 12:12:49 1.13
+++ pkgsrc/devel/poco/Makefile.common 2018/02/01 16:43:04 1.14
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.13 2016/02/25 12:12:49 jperkin Exp $ 1# $NetBSD: Makefile.common,v 1.14 2018/02/01 16:43:04 jperkin Exp $
2# 2#
3# used by devel/poco/Makefile 3# used by devel/poco/Makefile
4# used by databases/poco-data/Makefile 4# used by databases/poco-data/Makefile
5# used by databases/poco-data-sqlite/Makefile 5# used by databases/poco-data-sqlite/Makefile
6# used by databases/poco-data-mysql/Makefile 6# used by databases/poco-data-mysql/Makefile
7# used by databases/poco-data-odbc/Makefile 7# used by databases/poco-data-odbc/Makefile
8 8
9POCO_VERSION=1.6.1 9POCO_VERSION=1.6.1
10 10
11DISTNAME= poco-${POCO_VERSION}-all 11DISTNAME= poco-${POCO_VERSION}-all
12MASTER_SITES= http://pocoproject.org/releases/poco-${POCO_VERSION}/ 12MASTER_SITES= http://pocoproject.org/releases/poco-${POCO_VERSION}/
13 13
14MAINTAINER= pkgsrc-users@NetBSD.org 14MAINTAINER= pkgsrc-users@NetBSD.org
@@ -38,27 +38,25 @@ CONFIGURE_ARGS+= --unbundled @@ -38,27 +38,25 @@ CONFIGURE_ARGS+= --unbundled
38 38
39.if !empty(OPSYS:M*BSD) || ${OPSYS} == "DragonFly" || ${OPSYS} == "Bitrig" 39.if !empty(OPSYS:M*BSD) || ${OPSYS} == "DragonFly" || ${OPSYS} == "Bitrig"
40CONFIGURE_ARGS+= --config=FreeBSD 40CONFIGURE_ARGS+= --config=FreeBSD
41.endif 41.endif
42 42
43# NetBSD doesn't have fenv.h. We should add one. 43# NetBSD doesn't have fenv.h. We should add one.
44CONFIGURE_ARGS.NetBSD+= --no-fpenvironment 44CONFIGURE_ARGS.NetBSD+= --no-fpenvironment
45CONFIGURE_ARGS.NetBSD+= --no-sharedmemory 45CONFIGURE_ARGS.NetBSD+= --no-sharedmemory
46 46
47.if ${OPSYS} == "SunOS" 47.if ${OPSYS} == "SunOS"
48.include "../../mk/compiler.mk" 48.include "../../mk/compiler.mk"
49. if ${PKGSRC_COMPILER} == "sunpro" 49. if ${PKGSRC_COMPILER} == "sunpro"
50CONFIGURE_ARGS+= --config=SunOS-SunStudio 50CONFIGURE_ARGS+= --config=SunOS-SunStudio
51. elif ${PKGSRC_COMPILER} == "gcc" 51. else
52CONFIGURE_ARGS+= --config=SunOS-GCC 52CONFIGURE_ARGS+= --config=SunOS-GCC
53# GCC 4.6 and newer forces c99 for C++, need _XOPEN_SOURCE=600 53# GCC 4.6 and newer forces c99 for C++, need _XOPEN_SOURCE=600
54. if !empty(CC_VERSION:Mgcc-4.[6-9].*) 54. if !empty(CC_VERSION:Mgcc-4.[6-9].*) || !empty(PKGSRC_COMPILER:Mclang)
55MAKE_ENV+= XOPEN_SOURCE=600 55MAKE_ENV+= XOPEN_SOURCE=600
56. else 56. else
57MAKE_ENV+= XOPEN_SOURCE=500 57MAKE_ENV+= XOPEN_SOURCE=500
58. endif 58. endif
59. else 
60CONFIGURE_ARGS+= --config=SunOS 
61. endif 59. endif
62.endif 60.endif
63 61
64MAKE_FLAGS+= POCO_BASE=${WRKSRC} 62MAKE_FLAGS+= POCO_BASE=${WRKSRC}