Mon May 8 17:34:15 2017 UTC ()
Default to pkgsrc terminfo.  The curses default was switched to pkgsrc a
while ago, but since then any packages that included both curses and
terminfo ended up with conflicting BUILDLINK_TRANSFORM entries, leaving it
to include ordering to determine whether the builtin or pkgsrc curses was
used.  This keeps them in sync, at least by default, though ideally we'd
ensure that at an infrastructure level.


(jperkin)
diff -r1.74 -r1.75 pkgsrc/mk/platform/SunOS.mk
cvs diff -r1.74 -r1.75 pkgsrc/mk/platform/SunOS.mk (expand / switch to unified diff)

--- pkgsrc/mk/platform/SunOS.mk 2017/03/08 15:26:51 1.74
+++ pkgsrc/mk/platform/SunOS.mk 2017/05/08 17:34:15 1.75
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: SunOS.mk,v 1.74 2017/03/08 15:26:51 jperkin Exp $ 1# $NetBSD: SunOS.mk,v 1.75 2017/05/08 17:34:15 jperkin Exp $
2# 2#
3# Variable definitions for the SunOS/Solaris operating system. 3# Variable definitions for the SunOS/Solaris operating system.
4 4
5ECHO_N?= ${ECHO} -n 5ECHO_N?= ${ECHO} -n
6IMAKE_MAKE?= ${MAKE} # program which gets invoked by imake 6IMAKE_MAKE?= ${MAKE} # program which gets invoked by imake
7PKGLOCALEDIR?= lib 7PKGLOCALEDIR?= lib
8PS?= /bin/ps 8PS?= /bin/ps
9# XXX: default from defaults/mk.conf. Verify/correct for this platform 9# XXX: default from defaults/mk.conf. Verify/correct for this platform
10# and remove this comment. 10# and remove this comment.
11SU?= /usr/bin/su 11SU?= /usr/bin/su
12TYPE?= /usr/bin/type 12TYPE?= /usr/bin/type
13 13
14CATMAN_SECTION_SUFFIX?= yes 14CATMAN_SECTION_SUFFIX?= yes
@@ -88,28 +88,31 @@ BUILDLINK_TRANSFORM+= rm:-Wl,--warn-shar @@ -88,28 +88,31 @@ BUILDLINK_TRANSFORM+= rm:-Wl,--warn-shar
88BUILDLINK_TRANSFORM+= rm:-Wl,-export-dynamic 88BUILDLINK_TRANSFORM+= rm:-Wl,-export-dynamic
89BUILDLINK_TRANSFORM+= rm:-export-dynamic 89BUILDLINK_TRANSFORM+= rm:-export-dynamic
90 90
91# Convert GNU ld flags to native SunOS ld flags where possible. 91# Convert GNU ld flags to native SunOS ld flags where possible.
92BUILDLINK_TRANSFORM+= opt:-Wl,--rpath:-Wl,-R 92BUILDLINK_TRANSFORM+= opt:-Wl,--rpath:-Wl,-R
93 93
94# Remove GCC-specific flags if using clang 94# Remove GCC-specific flags if using clang
95.if ${PKGSRC_COMPILER} == "clang" 95.if ${PKGSRC_COMPILER} == "clang"
96BUILDLINK_TRANSFORM+= rm:-mimpure-text 96BUILDLINK_TRANSFORM+= rm:-mimpure-text
97.endif 97.endif
98 98
99# The native curses implementations are reasonably old and can cause lots of 99# The native curses implementations are reasonably old and can cause lots of
100# issues with software which assumes newer interfaces, so it's easier to just 100# issues with software which assumes newer interfaces, so it's easier to just
101# use pkgsrc curses at this point. 101# use pkgsrc curses at this point. Both curses and terminfo should be in sync
102_INCOMPAT_CURSES= SunOS-*-* 102# otherwise it's possible to end up with conflicting buildlink transforms.
 103#
 104_INCOMPAT_CURSES= SunOS-*-*
 105_OPSYS_PREFER.terminfo?= pkgsrc
103 106
104# Solaris has /usr/include/iconv.h, but it's not GNU iconv, so mark it 107# Solaris has /usr/include/iconv.h, but it's not GNU iconv, so mark it
105# incompatible. 108# incompatible.
106_INCOMPAT_ICONV= SunOS-*-* 109_INCOMPAT_ICONV= SunOS-*-*
107 110
108_STRIPFLAG_CC?= ${_INSTALL_UNSTRIPPED:D:U-s} # cc(1) option to strip 111_STRIPFLAG_CC?= ${_INSTALL_UNSTRIPPED:D:U-s} # cc(1) option to strip
109_STRIPFLAG_INSTALL?= ${_INSTALL_UNSTRIPPED:D:U-s} # install(1) option to strip 112_STRIPFLAG_INSTALL?= ${_INSTALL_UNSTRIPPED:D:U-s} # install(1) option to strip
110 113
111PKG_TOOLS_BIN?= ${LOCALBASE}/sbin 114PKG_TOOLS_BIN?= ${LOCALBASE}/sbin
112 115
113.if ${MACHINE_ARCH} == "x86_64" 116.if ${MACHINE_ARCH} == "x86_64"
114LIBABISUFFIX= /amd64 117LIBABISUFFIX= /amd64
115.endif 118.endif