r914 - in lvm2/trunk/debian: . patches

[Bastian Blank]

Author: waldi
Date: Sun May 27 14:43:10 2012
New Revision: 914

Log:
* debian/changelog: Update.
* debian/patches/install.patch: Force gcc.
* debian/rules: Provide CLDFLAGS and CC to configure.

Modified:
   lvm2/trunk/debian/changelog
   lvm2/trunk/debian/patches/install.patch
   lvm2/trunk/debian/rules

Modified: lvm2/trunk/debian/changelog
==============================================================================
--- lvm2/trunk/debian/changelog	Sun May 27 14:25:21 2012	(r913)
+++ lvm2/trunk/debian/changelog	Sun May 27 14:43:10 2012	(r914)
@@ -4,6 +4,7 @@
   * Add dmeventd and libdevmapper-event packages. (closes: #514706)
     - Disable monitoring by default.
     - Force dmeventd to look into correct directory for shared libs.
+  * Also link shared libs with correct flags.
 
  -- Bastian Blank <waldi at debian.org>  Sun, 27 May 2012 13:51:57 +0200
 

Modified: lvm2/trunk/debian/patches/install.patch
==============================================================================
--- lvm2/trunk/debian/patches/install.patch	Sun May 27 14:25:21 2012	(r913)
+++ lvm2/trunk/debian/patches/install.patch	Sun May 27 14:43:10 2012	(r914)
@@ -1,7 +1,11 @@
 --- a/make.tmpl.in
 +++ b/make.tmpl.in
-@@ -20,6 +20,7 @@
- CC ?= @CC@
+@@ -17,9 +17,10 @@
+ 
+ @SET_MAKE@
+ 
+-CC ?= @CC@
++CC = @CC@
  RANLIB = @RANLIB@
  INSTALL = @INSTALL@
 +INSTALL_DATA = @INSTALL@ -m 644

Modified: lvm2/trunk/debian/rules
==============================================================================
--- lvm2/trunk/debian/rules	Sun May 27 14:25:21 2012	(r913)
+++ lvm2/trunk/debian/rules	Sun May 27 14:43:10 2012	(r914)
@@ -36,12 +36,14 @@
 CFLAGS_OPT_UDEB = -Os
 endif
 
-CONFIGURE_FLAGS = --build $(DEB_BUILD_GNU_TYPE)
+CONFIGURE = ./configure \
+		CC=gcc CFLAGS="$(CPPFLAGS) $(CFLAGS)" LDFLAGS="$(LDFLAGS)" CLDFLAGS="$(LDFLAGS)" \
+		--build $(DEB_BUILD_GNU_TYPE)
 ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
-CONFIGURE_FLAGS += --host $(DEB_HOST_GNU_TYPE)
+CONFIGURE += --host $(DEB_HOST_GNU_TYPE)
 endif
 
-CONFIGURE_FLAGS += \
+CONFIGURE += \
 	--prefix=/usr \
 	--exec-prefix= \
 	--mandir=\$${prefix}/share/man \
@@ -71,9 +73,7 @@
 $(STAMPS_DIR)/setup_deb: $(STAMPS_DIR)/source
 	rm -rf $(DIR)
 	cp -al '$(SOURCE_DIR)' '$(DIR)'
-	cd $(DIR); \
-	./configure CFLAGS="$(CPPFLAGS) $(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
-		$(CONFIGURE_FLAGS) \
+	$(CONFIGURE) \
 		--libdir=\$${exec_prefix}/lib/$(DEB_HOST_MULTIARCH) \
 		--with-optimisation="$(CFLAGS_OPT_DEB)" \
 		--with-clvmd=cman,corosync,openais \
@@ -97,8 +97,7 @@
 	rm -rf $(DIR)
 	cp -al '$(SOURCE_DIR)' '$(DIR)'
 	cd $(DIR); \
-	./configure CFLAGS="$(CPPFLAGS) $(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
-		$(CONFIGURE_FLAGS) \
+	$(CONFIGURE) \
 		--with-optimisation="$(CFLAGS_OPT_UDEB)" \
 		--with-cluster=none \
 		--with-lvm1=none \