Skip to contentSkip to conversation

liblvm2app version and install patchset

PATCH New Thomas Woerner 1 participant 6 messages Jul 22, 2009

lore
Share & tools
lore
#0 lore raw

cover liblvm2app version and install patchset

The following patches will add the api version for liblvm2app, the install environment for liblvm2app and also a pkgconfig file.

Changes for the parsing of VERSIONS was neede for this. LIB_STATIC remains from the liblvm/Makefile.in have been removed.

Thomas Woerner (5):
Add liblvm2app api version as so minor version number for
liblvm2app.so.<major>.<lvm2app api version>
Use LIB_VERSION_APPLIB as liblvm so version. Remove LIB_STATIC remains from liblvm/Makefile.in. Add liblvm dynamic install target.
Add lvm2app pkgconfig file

 VERSION              |    2 +-
 configure.in         |   10 +++++++---
 liblvm/Makefile.in   |   36 +++++++++++++++++++++++++++++++-----
 liblvm/lvm2app.pc.in |   11 +++++++++++
 make.tmpl.in         |    3 +++
 5 files changed, 53 insertions(+), 9 deletions(-)
 create mode 100644 liblvm/lvm2app.pc.in
#1 lore raw

PATCH 1/5 Add liblvm2app api version as so minor version number for liblvm2app.so.<major>.<lvm2app api version>

Extend VERSION from "<major>.<minor>.<patchlevel>[-<tag>] (date)" to "<major>.<minor>.<patchlevel>(<lvm2app api version>)[-<tag>] (date)". Change parsing of LVM_RELEASE_DATE that it expects a ' ' before the date. Change parsing of LVM_RELEASE and LVM_PATCHLEVEL that it honors '(' after the patchlevel. Add LIB_VERSION_APPLIB to get <major>.<lvm2app api version> from VERSION.

---
 VERSION      |    2 +-
 configure.in |    6 +++---
 make.tmpl.in |    3 +++
 3 files changed, 7 insertions(+), 4 deletions(-)
VERSION +1 -1
index c901e1d..728793b 100644
@@ -1 +1 @@
-2.02.50-cvs (2009-07-15)
+2.02.50(01)-cvs (2009-07-15)
configure.in +3 -3
index eb6278d..d0e68a6 100644
@@ -750,13 +750,13 @@ DM_LIB_PATCHLEVEL=`cat VERSION_DM | $AWK -F '[[-. ]]' '{printf "%s.%s.%s",$1,$2,
 LVM_VERSION="\"`cat VERSION 2>/dev/null || echo Unknown`\""
 
 VER=`cat VERSION`
-LVM_RELEASE_DATE="\"`echo $VER | $SED 's/.*(//;s/).*//'`\""
+LVM_RELEASE_DATE="\"`echo $VER | $SED 's/.* (//;s/).*//'`\""
 VER=`echo "$VER" | $AWK '{print $1}'`
-LVM_RELEASE="\"`echo "$VER" | $AWK -F '-' '{print $2}'`\""
+LVM_RELEASE="\"`echo "$VER" | $AWK -F '[[(-]]' '{print $2}'`\""
 VER=`echo "$VER" | $AWK -F '-' '{print $1}'`
 LVM_MAJOR=`echo "$VER" | $AWK -F '.' '{print $1}'`
 LVM_MINOR=`echo "$VER" | $AWK -F '.' '{print $2}'`
-LVM_PATCHLEVEL=`echo "$VER" | $AWK -F '.' '{print $3}'`
+LVM_PATCHLEVEL=`echo "$VER" | $AWK -F '[[(.]]' '{print $3}'`
 
 ################################################################################
 AC_SUBST(APPLIB)
make.tmpl.in +3 -0
index fa3b884..5556d16 100644
@@ -116,6 +116,9 @@ LIB_VERSION_LVM := $(shell cat $(top_srcdir)/VERSION | \
 LIB_VERSION_DM := $(shell cat $(top_srcdir)/VERSION_DM | \
 		    awk -F '.' '{printf "%s.%s",$$1,$$2}')
 
+LIB_VERSION_APPLIB := $(shell cat $(top_srcdir)/VERSION | \
+		   awk -F '[(). ]' '{printf "%s.%s",$$1,$$4}')
+
 INCLUDES += -I. -I$(top_srcdir)/include
 
 INC_LNS = $(top_srcdir)/include/.symlinks_created
Signature · 1 line
1.6.2.5
#2 lore raw

PATCH 2/5 Use LIB_VERSION_APPLIB as liblvm so version.

---
 liblvm/Makefile.in |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
liblvm/Makefile.in +2 -2
index 643cc0c..a330f1e 100644
@@ -22,7 +22,7 @@ SOURCES =\
 
 LIB_NAME = liblvm2app
 LIB_VERSION = $(LIB_VERSION_LVM)
-VERSIONED_SHLIB = $(LIB_NAME).$(LIB_SUFFIX).$(LIB_VERSION_LVM)
+VERSIONED_SHLIB = $(LIB_NAME).$(LIB_SUFFIX).$(LIB_VERSION_APPLIB)
 
 ifeq ("@STATIC_LINK@", "yes")
 LIB_STATIC = $(LIB_NAME).a
@@ -35,7 +35,7 @@ include $(top_srcdir)/make.tmpl
 
 LIBS += -ldevmapper -llvm-internal
 
-$(VERSIONED_SHLIB): %.$(LIB_SUFFIX).$(LIB_VERSION): %.$(LIB_SUFFIX)
+$(VERSIONED_SHLIB): %.$(LIB_SUFFIX).$(LIB_VERSION_APPLIB): %.$(LIB_SUFFIX)
 	rm -f $@
 	$(LN_S) $< $@
 
Signature · 1 line
1.6.2.5
#3 lore raw

PATCH 3/5 Remove LIB_STATIC remains from liblvm/Makefile.in.

---
 liblvm/Makefile.in |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)
liblvm/Makefile.in +0 -3
index a330f1e..0deaeac 100644
@@ -24,9 +24,6 @@ LIB_NAME = liblvm2app
 LIB_VERSION = $(LIB_VERSION_LVM)
 VERSIONED_SHLIB = $(LIB_NAME).$(LIB_SUFFIX).$(LIB_VERSION_APPLIB)
 
-ifeq ("@STATIC_LINK@", "yes")
-LIB_STATIC = $(LIB_NAME).a
-endif
 LIB_SHARED = $(LIB_NAME).so
 
 CLEAN_TARGETS += liblvm.cflow
Signature · 1 line
1.6.2.5
#4 lore raw

PATCH 4/5 Add liblvm dynamic install target.

Install liblvm2app into libdir altogether with the devel link.

---
 liblvm/Makefile.in |   22 ++++++++++++++++++++++
 1 files changed, 22 insertions(+), 0 deletions(-)
liblvm/Makefile.in +22 -0
index 0deaeac..f19069d 100644
@@ -43,3 +43,25 @@ liblvm.cflow: $(SOURCES)
 		 ) > $@
 
 cflow: liblvm.cflow
+
+.PHONY: install_dynamic install_include install_pkgconfig
+
+INSTALL_TYPE = install_dynamic
+
+ifeq ("@PKGCONFIG@", "yes")
+  INSTALL_TYPE += install_pkgconfig
+endif
+
+install: $(INSTALL_TYPE) install_include
+
+install_include:
+	$(INSTALL) -D $(OWNER) $(GROUP) -m 444 lvm.h $(includedir)/lvm.h
+
+install_dynamic:
+	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $(VERSIONED_SHLIB) \
+		$(libdir)/$(VERSIONED_SHLIB)
+	$(LN_S) -f $(VERSIONED_SHLIB) $(libdir)/$(LIB_NAME).$(LIB_SUFFIX)
+
+.PHONY: distclean_lib distclean
+
+distclean: distclean_lib
Signature · 1 line
1.6.2.5
#5 lore raw

PATCH 5/5 Add lvm2app pkgconfig file

Add liblvm/lvm2app.pc.in.
Add LVM2APP_LIB_VERSION to configure.in to create lvm2app.pc from lvm2app.pc.in with the proper version. Add install_pkgconfig target and also distclean_lib to liblvm/Makefile.in.

---
 configure.in         |    4 ++++
 liblvm/Makefile.in   |    7 +++++++
 liblvm/lvm2app.pc.in |   11 +++++++++++
 3 files changed, 22 insertions(+), 0 deletions(-)
 create mode 100644 liblvm/lvm2app.pc.in
configure.in +4 -0
index d0e68a6..6af7109 100644
@@ -758,6 +758,8 @@ LVM_MAJOR=`echo "$VER" | $AWK -F '.' '{print $1}'`
 LVM_MINOR=`echo "$VER" | $AWK -F '.' '{print $2}'`
 LVM_PATCHLEVEL=`echo "$VER" | $AWK -F '[[(.]]' '{print $3}'`
 
+LVM2APP_LIB_VERSION=`echo "$VER" | $AWK -F'[- ]' '{print $1}'`
+
 ################################################################################
 AC_SUBST(APPLIB)
 AC_SUBST(BUILD_DMEVENTD)
@@ -806,6 +808,7 @@ AC_SUBST(LVM_MINOR)
 AC_SUBST(LVM_PATCHLEVEL)
 AC_SUBST(LVM_RELEASE)
 AC_SUBST(LVM_RELEASE_DATE)
+AC_SUBST(LVM2APP_LIB_VERSION)
 AC_SUBST(MIRRORS)
 AC_SUBST(MSGFMT)
 AC_SUBST(OWNER)
@@ -850,6 +853,7 @@ lib/snapshot/Makefile
 libdm/Makefile
 libdm/libdevmapper.pc
 liblvm/Makefile
+liblvm/lvm2app.pc
 man/Makefile
 po/Makefile
 scripts/clvmd_init_red_hat
liblvm/Makefile.in +7 -0
index f19069d..1c1decb 100644
@@ -62,6 +62,13 @@ install_dynamic:
 		$(libdir)/$(VERSIONED_SHLIB)
 	$(LN_S) -f $(VERSIONED_SHLIB) $(libdir)/$(LIB_NAME).$(LIB_SUFFIX)
 
+install_pkgconfig:
+	$(INSTALL) -D $(OWNER) $(GROUP) -m 444 lvm2app.pc \
+		$(usrlibdir)/pkgconfig/
+
 .PHONY: distclean_lib distclean
 
+distclean_lib:
+	$(RM) lvm2app.pc
+
 distclean: distclean_lib
liblvm/lvm2app.pc.in new file +11 -0
new file mode 100644
index 0000000..abfbc7e
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: lvm2app
+Description: lvm2app application library
+Version: @LVM2APP_LIB_VERSION@
+Cflags: -I${includedir} 
+Libs: -L${libdir} -llvm2app
+Libs.private: -ldevmapper
Signature · 1 line
1.6.2.5