r574 - lvm2/trunk/debian

[Bastian Blank]

Author: waldi
Date: Mon Jun  2 19:50:23 2008
New Revision: 574

Log:
debian/rules: Fix optimization flags.


Modified:
   lvm2/trunk/debian/rules

Modified: lvm2/trunk/debian/rules
==============================================================================
--- lvm2/trunk/debian/rules	(original)
+++ lvm2/trunk/debian/rules	Mon Jun  2 19:50:23 2008
@@ -17,6 +17,11 @@
 PACKAGES_DEB = lvm2 clvm
 PACKAGES_UDEB = lvm2-udeb
 
+CFLAGS_UDEB := $(CFLAGS)
+ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+CFLAGS_UDEB = -g -Os
+endif
+
 CONFIGURE_FLAGS = --build $(DEB_BUILD_GNU_TYPE)
 ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
 CONFIGURE_FLAGS += --host $(DEB_HOST_GNU_TYPE)
@@ -47,6 +52,7 @@
 	cd $(DIR); \
 	./configure CFLAGS="$(CFLAGS)" \
 		$(CONFIGURE_FLAGS) \
+		--with-optimisation="" \
 		--with-cluster=shared \
 		--with-clvmd=cman \
 		--enable-readline
@@ -61,9 +67,9 @@
 	cd $(DIR); QUILT_PATCHES=$(CURDIR)/debian/patches quilt --quiltrc /dev/null push -a || test $$? = 2
 	cd $(DIR); autoreconf
 	cd $(DIR); \
-	./configure CFLAGS="$(CFLAGS)" \
+	./configure CFLAGS="$(CFLAGS_UDEB)" \
 		$(CONFIGURE_FLAGS) \
-		--with-optimisation="-Os" \
+		--with-optimisation="" \
 		--with-lvm1=none \
 		--with-pool=none
 	touch $@