Date: Thu, 28 Aug 2014 19:59:05 +0000 (UTC) From: Garrett Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270760 - in stable/10: lib/libc share/mk Message-ID: <201408281959.s7SJx5u8053142@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Thu Aug 28 19:59:04 2014 New Revision: 270760 URL: http://svnweb.freebsd.org/changeset/base/270760 Log: MFC r270519: Fix "make checkdpadd" for lib/libc when MK_SSP != no Add LIBSSP_NONSHARED to bsd.libnames.mk and append LIBSSP_NONSHARED to DPADD in lib/libc when MK_SSP != no Approved by: rpaulo (mentor) Phabric: D675 (as part of a larger diff) PR: 192728 Modified: stable/10/lib/libc/Makefile stable/10/share/mk/bsd.libnames.mk Directory Properties: stable/10/ (props changed) Modified: stable/10/lib/libc/Makefile ============================================================================== --- stable/10/lib/libc/Makefile Thu Aug 28 19:50:08 2014 (r270759) +++ stable/10/lib/libc/Makefile Thu Aug 28 19:59:04 2014 (r270760) @@ -47,6 +47,7 @@ LDFLAGS+= -nodefaultlibs LDADD+= -lgcc .if ${MK_SSP} != "no" +DPADD+= ${LIBSSP_NONSHARED} LDADD+= -lssp_nonshared .endif Modified: stable/10/share/mk/bsd.libnames.mk ============================================================================== --- stable/10/share/mk/bsd.libnames.mk Thu Aug 28 19:50:08 2014 (r270759) +++ stable/10/share/mk/bsd.libnames.mk Thu Aug 28 19:59:04 2014 (r270760) @@ -142,6 +142,7 @@ LIBSDP?= ${DESTDIR}${LIBDIR}/libsdp.a LIBSMB?= ${DESTDIR}${LIBDIR}/libsmb.a LIBSSH?= ${DESTDIR}${LIBPRIVATEDIR}/libssh.a LIBSSL?= ${DESTDIR}${LIBDIR}/libssl.a +LIBSSP_NONSHARED?= ${DESTDIR}${LIBDIR}/libssp_nonshared.a LIBSTAND?= ${DESTDIR}${LIBDIR}/libstand.a LIBSTDCPLUSPLUS?= ${DESTDIR}${LIBDIR}/libstdc++.a LIBTACPLUS?= ${DESTDIR}${LIBDIR}/libtacplus.a
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408281959.s7SJx5u8053142>