Module Name: src
Committed By: riz
Date: Fri May 18 16:56:26 UTC 2012
Modified Files:
src/external/gpl2/lvm2/lib/liblvm [netbsd-6]: Makefile
src/external/gpl2/lvm2/sbin/lvm [netbsd-6]: Makefile
Log Message:
Pull up following revision(s) (requested by veego 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@
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.5.6.1 src/external/gpl2/lvm2/lib/liblvm/Makefile
cvs rdiff -u -r1.10 -r1.10.6.1 src/external/gpl2/lvm2/sbin/lvm/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl2/lvm2/lib/liblvm/Makefile
diff -u src/external/gpl2/lvm2/lib/liblvm/Makefile:1.5 src/external/gpl2/lvm2/lib/liblvm/Makefile:1.5.6.1
--- src/external/gpl2/lvm2/lib/liblvm/Makefile:1.5 Thu May 26 12:56:26 2011
+++ src/external/gpl2/lvm2/lib/liblvm/Makefile Fri May 18 16:56:26 2012
@@ -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 @@ CWARNFLAGS+= -Wno-parentheses
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.
#
Index: src/external/gpl2/lvm2/sbin/lvm/Makefile
diff -u src/external/gpl2/lvm2/sbin/lvm/Makefile:1.10 src/external/gpl2/lvm2/sbin/lvm/Makefile:1.10.6.1
--- src/external/gpl2/lvm2/sbin/lvm/Makefile:1.10 Thu May 26 12:56:26 2011
+++ src/external/gpl2/lvm2/sbin/lvm/Makefile Fri May 18 16:56:26 2012
@@ -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+= -I${LVM2_DISTDIR}/lib -I${LVM
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.
#
