[src/trunk]: src/external/gpl2/lvm2 Use static libdm so dmsetup and lvm can b...

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

details:   https://anonhg.NetBSD.org/src/rev/b191ee2dbaa4
branches:  trunk
changeset: 762890:b191ee2dbaa4
user:      matt <matt%NetBSD.org@localhost>
date:      Fri Mar 04 22:48:29 2011 +0000

description:
Use static libdm so dmsetup and lvm can be linked dynamically.
Change LIBDM_* to LIBDEVMAPPER_* so LIBDM can refer to libdm.

diffstat:

 external/gpl2/lvm2/lib/libdevmapper/Makefile |  24 ++++++++++++++----------
 external/gpl2/lvm2/lvm2tools.mk              |  12 +++++++-----
 external/gpl2/lvm2/sbin/dmsetup/Makefile     |  21 +++++++++++++--------
 external/gpl2/lvm2/sbin/lvm/Makefile         |  21 +++++++++++++--------
 4 files changed, 47 insertions(+), 31 deletions(-)

diffs (159 lines):

diff -r 0dc27b570d44 -r b191ee2dbaa4 external/gpl2/lvm2/lib/libdevmapper/Makefile
--- a/external/gpl2/lvm2/lib/libdevmapper/Makefile      Fri Mar 04 22:25:24 2011 +0000
+++ b/external/gpl2/lvm2/lib/libdevmapper/Makefile      Fri Mar 04 22:48:29 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.6 2011/02/11 06:35:26 matt Exp $
+#      $NetBSD: Makefile,v 1.7 2011/03/04 22:48:29 matt Exp $
 
 USE_SHLIBDIR=  yes
 USE_FORT?=     no
@@ -8,10 +8,14 @@
 
 LIB=           devmapper
 
-CPPFLAGS+=     -I${LIBDM_DISTDIR} -I${LIBDM_DISTDIR}/misc -I${LIBDM_DISTDIR}/mm \
-               -I${LIBDM_DISTDIR}/datastruct -I${LIBDM_DISTDIR}/ioctl \
-               -I${LVM2_DISTDIR}/include -I${LIBDM_SRCDIR} -D__NetBSD__
-
+CPPFLAGS+=     -I${LIBDEVMAPPER_DISTDIR} \
+               -I${LIBDEVMAPPER_DISTDIR}/misc \
+               -I${LIBDEVMAPPER_DISTDIR}/mm \
+               -I${LIBDEVMAPPER_DISTDIR}/datastruct \
+               -I${LIBDEVMAPPER_DISTDIR}/ioctl \
+               -I${LVM2_DISTDIR}/include \
+               -I${LIBDEVMAPPER_SRCDIR} \
+               -D__NetBSD__
 
 CPPFLAGS+=     -D__LIB_DEVMAPPER__ 
 
@@ -29,10 +33,10 @@
 DBG=            -g
 .endif
 
-.PATH: ${LIBDM_DISTDIR}/
-.PATH: ${LIBDM_DISTDIR}/datastruct
-.PATH: ${LIBDM_DISTDIR}/mm
-.PATH: ${LIBDM_DISTDIR}/regex
-.PATH: ${LIBDM_DISTDIR}/ioctl
+.PATH: ${LIBDEVMAPPER_DISTDIR}/
+.PATH: ${LIBDEVMAPPER_DISTDIR}/datastruct
+.PATH: ${LIBDEVMAPPER_DISTDIR}/mm
+.PATH: ${LIBDEVMAPPER_DISTDIR}/regex
+.PATH: ${LIBDEVMAPPER_DISTDIR}/ioctl
 
 .include <bsd.lib.mk>
diff -r 0dc27b570d44 -r b191ee2dbaa4 external/gpl2/lvm2/lvm2tools.mk
--- a/external/gpl2/lvm2/lvm2tools.mk   Fri Mar 04 22:25:24 2011 +0000
+++ b/external/gpl2/lvm2/lvm2tools.mk   Fri Mar 04 22:48:29 2011 +0000
@@ -1,20 +1,22 @@
-#      $NetBSD: lvm2tools.mk,v 1.3 2011/01/05 14:57:27 haad Exp $
+#      $NetBSD: lvm2tools.mk,v 1.4 2011/03/04 22:48:29 matt Exp $
 
 .include <bsd.own.mk>
 
 LVM2_SRCDIR=   ${NETBSDSRCDIR}/external/gpl2/lvm2
 LVM2_DISTDIR=  ${NETBSDSRCDIR}/external/gpl2/lvm2/dist
 
-LIBDM_SRCDIR=          ${NETBSDSRCDIR}/external/gpl2/lvm2/lib/libdevmapper
-LIBDM_DISTDIR=         ${NETBSDSRCDIR}/external/gpl2/lvm2/dist/libdm
-LIBDM_INCLUDE=         ${NETBSDSRCDIR}/external/gpl2/lvm2/dist/include
+LIBDEVMAPPER_SRCDIR=           ${LVM2_SRCDIR}/lib/libdevmapper
+LIBDEVMAPPER_DISTDIR=          ${LVM2_DISTDIR}/libdm
+LIBDEVMAPPER_INCLUDE=          ${LVM2_DISTDIR}/include
+
+LIBDM_SRCDIR=                  ${NETBSDSRCDIR}/lib/libdm
 
 # root:operator [cb]rw-r-----
 CPPFLAGS+=-DDM_DEVICE_UID=0 -DDM_DEVICE_GID=5 -DDM_DEVICE_MODE=0640 \
          -DDM_CONTROL_DEVICE_MODE=0660 -DLVM_LOCKDIR_MODE=0770
 
 #
-#LIBDM_OBJDIR.libdevmapper=${LIBDM_SRCDIR}/lib/libdevmapper/
+#LIBDEVMAPPER_OBJDIR.libdevmapper=${LIBDEVMAPPER_SRCDIR}/lib/libdevmapper/
 #
 #.if !defined(LVM2OBJDIR.liblvm)
 #LVM2OBJDIR.liblvm!=   cd ${LVM2_SRCDIR}/lib/liblvm && ${PRINTOBJDIR}
diff -r 0dc27b570d44 -r b191ee2dbaa4 external/gpl2/lvm2/sbin/dmsetup/Makefile
--- a/external/gpl2/lvm2/sbin/dmsetup/Makefile  Fri Mar 04 22:25:24 2011 +0000
+++ b/external/gpl2/lvm2/sbin/dmsetup/Makefile  Fri Mar 04 22:48:29 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.6 2011/02/08 03:26:13 haad Exp $
+#      $NetBSD: Makefile,v 1.7 2011/03/04 22:48:29 matt Exp $
 
 USE_FORT?=     no
 NOLINT=                #defined
@@ -15,18 +15,23 @@
 
 #CFLAGS+= -g -O0
 
-CPPFLAGS+=      -I${LIBDM_DISTDIR}/ -I${LIBDM_DISTDIR}/misc \
-               -I. -I${LIBDM_DISTDIR}/ioctl -I${LVM2_DISTDIR}/include
+CPPFLAGS+=      -I${LIBDEVMAPPER_DISTDIR}/ -I${LIBDEVMAPPER_DISTDIR}/misc \
+               -I. -I${LIBDEVMAPPER_DISTDIR}/ioctl -I${LVM2_DISTDIR}/include
 
 CPPFLAGS+=     -D__LIB_DEVMAPPER__
 
-LIBDM_OBJDIR!= cd ${LIBDM_SRCDIR} && ${PRINTOBJDIR}
-LDADD+=                -L${LIBDM_OBJDIR} -ldevmapper
-DPADD+=                ${LIBDM_OBJDIR}/libdevmapper.a
+LIBDEVMAPPER_OBJDIR!=  cd ${LIBDEVMAPPER_SRCDIR} && ${PRINTOBJDIR}
+LDADD+=                -L${LIBDEVMAPPER_OBJDIR} -ldevmapper
+DPADD+=                ${LIBDEVMAPPER_OBJDIR}/libdevmapper.a
 
-LDADD+=                -ldm -lprop
+LIBDM_OBJDIR!= cd ${LIBDM_SRCDIR} && ${PRINTOBJDIR}
+#LDADD+=               -L${LIBDM_OBJDIR} -ldm
+LDADD+=                ${LIBDM_OBJDIR}/libdm.a
+DPADD+=                ${LIBDM_OBJDIR}/libdm.a
 
-LDSTATIC= -static
+LDADD+=                -lprop
+
+#LDSTATIC= -static
 .PATH: ${LVM2_DISTDIR}/tools
 
 .include <bsd.prog.mk>
diff -r 0dc27b570d44 -r b191ee2dbaa4 external/gpl2/lvm2/sbin/lvm/Makefile
--- a/external/gpl2/lvm2/sbin/lvm/Makefile      Fri Mar 04 22:25:24 2011 +0000
+++ b/external/gpl2/lvm2/sbin/lvm/Makefile      Fri Mar 04 22:48:29 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.8 2011/02/08 03:26:13 haad Exp $
+#      $NetBSD: Makefile,v 1.9 2011/03/04 22:48:29 matt Exp $
 
 USE_FORT?=     no
 NOLINT=                #defined
@@ -24,8 +24,8 @@
 
 
 CPPFLAGS+=     -I${LVM2_DISTDIR}/lib -I${LVM2_DISTDIR}/include \
-               -I. -I${LIBDM_INCLUDE} -I${LVM2_DISTDIR}/tools \
-               -I${LIBDM_DISTDIR}
+               -I. -I${LIBDEVMAPPER_INCLUDE} -I${LVM2_DISTDIR}/tools \
+               -I${LIBDEVMAPPER_DISTDIR}
 
 CPPFLAGS+=     -DLVM_SHARED_PATH=\"$(BINDIR)/lvm\"
 
@@ -95,13 +95,18 @@
 LDADD+=         -L${LIBLVM_OBJDIR} -llvm
 DPADD+=         ${LIBLVM_OBJDIR}/liblvm.a
 
-LIBDM_OBJDIR!=  cd ${LIBDM_SRCDIR} && ${PRINTOBJDIR}
-LDADD+=         -L${LIBDM_OBJDIR} -ldevmapper
-DPADD+=         ${LIBDM_OBJDIR}/libdevmapper.a
+LIBDEVMAPPER_OBJDIR!=  cd ${LIBDEVMAPPER_SRCDIR} && ${PRINTOBJDIR}
+LDADD+=         -L${LIBDEVMAPPER_OBJDIR} -ldevmapper
+DPADD+=         ${LIBDEVMAPPER_OBJDIR}/libdevmapper.a
 
-LDADD+=                -ldm -lprop -ledit -ltermcap
+LIBDM_OBJDIR!=  cd ${LIBDM_SRCDIR} && ${PRINTOBJDIR}
+#LDADD+=         -L${LIBDM_OBJDIR} -ldm
+LDADD+=         ${LIBDM_OBJDIR}/libdm.a
+DPADD+=         ${LIBDM_OBJDIR}/libdm.a
 
-LDSTATIC=      -static
+LDADD+=                -lprop -ledit -ltermcap
+
+#LDSTATIC=     -static
 
 .PATH: ${LVM2_DISTDIR}/tools