Module Name: src
Committed By: matt
Date: Fri Mar 4 22:48:29 UTC 2011
Modified Files:
src/external/gpl2/lvm2: lvm2tools.mk
src/external/gpl2/lvm2/lib/libdevmapper: Makefile
src/external/gpl2/lvm2/sbin/dmsetup: Makefile
src/external/gpl2/lvm2/sbin/lvm: Makefile
Log Message:
Use static libdm so dmsetup and lvm can be linked dynamically.
Change LIBDM_* to LIBDEVMAPPER_* so LIBDM can refer to libdm.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/gpl2/lvm2/lvm2tools.mk
cvs rdiff -u -r1.6 -r1.7 src/external/gpl2/lvm2/lib/libdevmapper/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/gpl2/lvm2/sbin/dmsetup/Makefile
cvs rdiff -u -r1.8 -r1.9 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/lvm2tools.mk
diff -u src/external/gpl2/lvm2/lvm2tools.mk:1.3 src/external/gpl2/lvm2/lvm2tools.mk:1.4
--- src/external/gpl2/lvm2/lvm2tools.mk:1.3 Wed Jan 5 14:57:27 2011
+++ src/external/gpl2/lvm2/lvm2tools.mk Fri Mar 4 22:48:29 2011
@@ -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}
Index: src/external/gpl2/lvm2/lib/libdevmapper/Makefile
diff -u src/external/gpl2/lvm2/lib/libdevmapper/Makefile:1.6 src/external/gpl2/lvm2/lib/libdevmapper/Makefile:1.7
--- src/external/gpl2/lvm2/lib/libdevmapper/Makefile:1.6 Fri Feb 11 06:35:26 2011
+++ src/external/gpl2/lvm2/lib/libdevmapper/Makefile Fri Mar 4 22:48:29 2011
@@ -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>
Index: src/external/gpl2/lvm2/sbin/dmsetup/Makefile
diff -u src/external/gpl2/lvm2/sbin/dmsetup/Makefile:1.6 src/external/gpl2/lvm2/sbin/dmsetup/Makefile:1.7
--- src/external/gpl2/lvm2/sbin/dmsetup/Makefile:1.6 Tue Feb 8 03:26:13 2011
+++ src/external/gpl2/lvm2/sbin/dmsetup/Makefile Fri Mar 4 22:48:29 2011
@@ -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__
+LIBDEVMAPPER_OBJDIR!= cd ${LIBDEVMAPPER_SRCDIR} && ${PRINTOBJDIR}
+LDADD+= -L${LIBDEVMAPPER_OBJDIR} -ldevmapper
+DPADD+= ${LIBDEVMAPPER_OBJDIR}/libdevmapper.a
+
LIBDM_OBJDIR!= cd ${LIBDM_SRCDIR} && ${PRINTOBJDIR}
-LDADD+= -L${LIBDM_OBJDIR} -ldevmapper
-DPADD+= ${LIBDM_OBJDIR}/libdevmapper.a
+#LDADD+= -L${LIBDM_OBJDIR} -ldm
+LDADD+= ${LIBDM_OBJDIR}/libdm.a
+DPADD+= ${LIBDM_OBJDIR}/libdm.a
-LDADD+= -ldm -lprop
+LDADD+= -lprop
-LDSTATIC= -static
+#LDSTATIC= -static
.PATH: ${LVM2_DISTDIR}/tools
.include <bsd.prog.mk>
Index: src/external/gpl2/lvm2/sbin/lvm/Makefile
diff -u src/external/gpl2/lvm2/sbin/lvm/Makefile:1.8 src/external/gpl2/lvm2/sbin/lvm/Makefile:1.9
--- src/external/gpl2/lvm2/sbin/lvm/Makefile:1.8 Tue Feb 8 03:26:13 2011
+++ src/external/gpl2/lvm2/sbin/lvm/Makefile Fri Mar 4 22:48:29 2011
@@ -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
+LIBDEVMAPPER_OBJDIR!= cd ${LIBDEVMAPPER_SRCDIR} && ${PRINTOBJDIR}
+LDADD+= -L${LIBDEVMAPPER_OBJDIR} -ldevmapper
+DPADD+= ${LIBDEVMAPPER_OBJDIR}/libdevmapper.a
+
LIBDM_OBJDIR!= cd ${LIBDM_SRCDIR} && ${PRINTOBJDIR}
-LDADD+= -L${LIBDM_OBJDIR} -ldevmapper
-DPADD+= ${LIBDM_OBJDIR}/libdevmapper.a
+#LDADD+= -L${LIBDM_OBJDIR} -ldm
+LDADD+= ${LIBDM_OBJDIR}/libdm.a
+DPADD+= ${LIBDM_OBJDIR}/libdm.a
-LDADD+= -ldm -lprop -ledit -ltermcap
+LDADD+= -lprop -ledit -ltermcap
-LDSTATIC= -static
+#LDSTATIC= -static
.PATH: ${LVM2_DISTDIR}/tools
