[src/netbsd-6]: src/external/gpl2/lvm2 Pull up following revision(s) (request...

[riz <riz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b5f5bd9ab4a8
branches:  netbsd-6
changeset: 774120:b5f5bd9ab4a8
user:      riz <riz%NetBSD.org@localhost>
date:      Fri May 18 16:56:26 2012 +0000

description:
Pull up following revision(s) (requested by cheusov in ticket #256):
        external/gpl2/lvm2/lib/liblvm/Makefile: revision 1.6
        external/gpl2/lvm2/sbin/lvm/Makefile: revision 1.11
Add .include <bsd.sys.mk> for initializing USE_SSP.
   This fixes build failure if USE_FORT=YES
   Approved by christos@

diffstat:

 external/gpl2/lvm2/lib/liblvm/Makefile |  5 ++++-
 external/gpl2/lvm2/sbin/lvm/Makefile   |  5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diffs (38 lines):

diff -r a9725ee0eb0e -r b5f5bd9ab4a8 external/gpl2/lvm2/lib/liblvm/Makefile
--- a/external/gpl2/lvm2/lib/liblvm/Makefile    Fri May 18 02:28:52 2012 +0000
+++ b/external/gpl2/lvm2/lib/liblvm/Makefile    Fri May 18 16:56:26 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.5 2011/05/26 12:56:26 joerg Exp $
+#      $NetBSD: Makefile,v 1.5.6.1 2012/05/18 16:56:26 riz Exp $
 
 LIBISPRIVATE=  yes
 
@@ -14,6 +14,9 @@
 CPPFLAGS+=     -I${LVM2_DISTDIR}/lib -I${LVM2_DISTDIR}/include \
                -I. 
 
+.include <bsd.own.mk>
+.include <bsd.sys.mk> # for USE_SSP
+
 # Some parts of liblvm can't be protected because if its
 # alloca() usage.
 #
diff -r a9725ee0eb0e -r b5f5bd9ab4a8 external/gpl2/lvm2/sbin/lvm/Makefile
--- a/external/gpl2/lvm2/sbin/lvm/Makefile      Fri May 18 02:28:52 2012 +0000
+++ b/external/gpl2/lvm2/sbin/lvm/Makefile      Fri May 18 16:56:26 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.10 2011/05/26 12:56:26 joerg Exp $
+#      $NetBSD: Makefile,v 1.10.6.1 2012/05/18 16:56:26 riz Exp $
 
 USE_FORT?=     no
 NOLINT=                #defined
@@ -30,6 +30,9 @@
 
 CPPFLAGS+=     -DLVM_SHARED_PATH=\"$(BINDIR)/lvm\"
 
+.include <bsd.own.mk>
+.include <bsd.sys.mk> # for USE_SSP
+
 # Some parts of the code can't be protected because if its
 # alloca() usage.
 #