diff options
| author | jperkin <jperkin> | 2016-10-27 10:31:05 +0000 |
|---|---|---|
| committer | jperkin <jperkin> | 2016-10-27 10:31:05 +0000 |
| commit | 0e47f1ddf56c79a62d1e6f524c1ffbd2a9039da4 (patch) | |
| tree | e50cd183698928a16884887c83a46b3584f8bf63 /mk/platform | |
| parent | 34650b37d26f6800081c22f66aea5235a96e284d (diff) | |
| download | pkgsrc-0e47f1ddf56c79a62d1e6f524c1ffbd2a9039da4.tar.gz | |
Add support for enabling cwrappers automatically. USE_CWRAPPERS now defaults
to "auto", which will enable cwrappers if the _OPSYS_SUPPORTS_CWRAPPERS
platform variable is set to "yes".
Switch over to cwrappers by default for Darwin, Linux, and SunOS (except when
using the sunpro compiler).
Diffstat (limited to 'mk/platform')
| -rw-r--r-- | mk/platform/Darwin.mk | 4 | ||||
| -rw-r--r-- | mk/platform/Linux.mk | 4 | ||||
| -rw-r--r-- | mk/platform/SunOS.mk | 7 |
3 files changed, 12 insertions, 3 deletions
diff --git a/mk/platform/Darwin.mk b/mk/platform/Darwin.mk index 5087a366ce0..c8b54da504a 100644 --- a/mk/platform/Darwin.mk +++ b/mk/platform/Darwin.mk @@ -1,4 +1,4 @@ -# $NetBSD: Darwin.mk,v 1.83 2016/09/06 09:50:20 jperkin Exp $ +# $NetBSD: Darwin.mk,v 1.84 2016/10/27 10:31:06 jperkin Exp $ # # Variable definitions for the Darwin operating system. @@ -153,6 +153,8 @@ BUILDLINK_TRANSFORM+= rm:-Wl,--export-dynamic BUILDLINK_TRANSFORM+= rm:-Wl,--gc-sections BUILDLINK_TRANSFORM+= rm:-Wl,--no-undefined +_OPSYS_SUPPORTS_CWRAPPERS= yes + _OPSYS_CAN_CHECK_SHLIBS= yes # check shared libraries using otool(1) # OSX strip(1) tries to remove relocatable symbols and fails on certain diff --git a/mk/platform/Linux.mk b/mk/platform/Linux.mk index 3e1348fda55..26bfca9aa4d 100644 --- a/mk/platform/Linux.mk +++ b/mk/platform/Linux.mk @@ -1,4 +1,4 @@ -# $NetBSD: Linux.mk,v 1.68 2016/09/17 05:41:37 richard Exp $ +# $NetBSD: Linux.mk,v 1.69 2016/10/27 10:31:06 jperkin Exp $ # # Variable definitions for the Linux operating system. @@ -104,6 +104,8 @@ _USE_RPATH= yes # add rpath to LDFLAGS _STRIPFLAG_CC?= ${_INSTALL_UNSTRIPPED:D:U-s} # cc(1) option to strip _STRIPFLAG_INSTALL?= ${_INSTALL_UNSTRIPPED:D:U-s} # install(1) option to strip +_OPSYS_SUPPORTS_CWRAPPERS= yes + _OPSYS_CAN_CHECK_SHLIBS= yes # use readelf in check/bsd.check-vars.mk # check for maximum command line length and set it in configure's environment, diff --git a/mk/platform/SunOS.mk b/mk/platform/SunOS.mk index 5f5e1590708..bd6ffee8dc8 100644 --- a/mk/platform/SunOS.mk +++ b/mk/platform/SunOS.mk @@ -1,4 +1,4 @@ -# $NetBSD: SunOS.mk,v 1.72 2016/08/25 12:08:29 jperkin Exp $ +# $NetBSD: SunOS.mk,v 1.73 2016/10/27 10:31:06 jperkin Exp $ # # Variable definitions for the SunOS/Solaris operating system. @@ -112,6 +112,11 @@ _OPSYS_SYSTEM_RPATH?= /lib${LIBABISUFFIX}:/usr/lib${LIBABISUFFIX} _OPSYS_LIB_DIRS?= /lib${LIBABISUFFIX} /usr/lib${LIBABISUFFIX} _OPSYS_INCLUDE_DIRS?= /usr/include +# Sun Studio support is untested at this time, but would be strongly desired. +.if ${PKGSRC_COMPILER} != "sunpro" +_OPSYS_SUPPORTS_CWRAPPERS= yes +.endif + # support FORTIFY (with GCC) _OPSYS_SUPPORTS_FORTIFY=yes |