r896 - lvm2/trunk/debian
Bastian Blank
waldi at alioth.debian.org
Thu May 3 10:00:27 UTC 2012
Author: waldi
Date: Thu May 3 10:00:27 2012
New Revision: 896
Log:
* debian/changelog: Update.
* debian/control: Build-depend on newer dpkg.
* debian/rules: Use buildflags support.
Modified:
lvm2/trunk/debian/changelog
lvm2/trunk/debian/control
lvm2/trunk/debian/rules
Modified: lvm2/trunk/debian/changelog
==============================================================================
--- lvm2/trunk/debian/changelog Thu May 3 09:33:48 2012 (r895)
+++ lvm2/trunk/debian/changelog Thu May 3 10:00:27 2012 (r896)
@@ -1,6 +1,7 @@
lvm2 (2.02.95-2) UNRELEASED; urgency=low
* Convert library packages to multi-arch.
+ * Use dpkg buildflags support.
-- Bastian Blank <waldi at debian.org> Thu, 03 May 2012 11:31:26 +0200
Modified: lvm2/trunk/debian/control
==============================================================================
--- lvm2/trunk/debian/control Thu May 3 09:33:48 2012 (r895)
+++ lvm2/trunk/debian/control Thu May 3 10:00:27 2012 (r896)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian LVM Team <pkg-lvm-maintainers at lists.alioth.debian.org>
Uploaders: Bastian Blank <waldi at debian.org>
-Build-Depends: debhelper (>= 8.1.3~), automake, libcman-dev (>> 2), libcorosync-dev, libdlm-dev (>> 2), libreadline-gplv2-dev, libselinux1-dev, libudev-dev, openais-dev, pkg-config
+Build-Depends: dpkg (>= 1.16.1~), debhelper (>= 8.1.3~), automake, libcman-dev (>> 2), libcorosync-dev, libdlm-dev (>> 2), libreadline-gplv2-dev, libselinux1-dev, libudev-dev, openais-dev, pkg-config
Standards-Version: 3.9.1
Homepage: http://sources.redhat.com/lvm2/
Vcs-Svn: svn://svn.debian.org/pkg-lvm/lvm2/trunk/
Modified: lvm2/trunk/debian/rules
==============================================================================
--- lvm2/trunk/debian/rules Thu May 3 09:33:48 2012 (r895)
+++ lvm2/trunk/debian/rules Thu May 3 10:00:27 2012 (r896)
@@ -8,6 +8,9 @@
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_CFLAGS_MAINT_STRIP = -O2
+include /usr/share/dpkg/buildflags.mk
+
SOURCE := $(shell dpkg-parsechangelog | sed -ne 's,^Source: *\(.*\)$$,\1,p')
VERSION_COMPLETE := $(shell dpkg-parsechangelog | sed -ne 's,^Version: *\(.*\)$$,\1,p')
VERSION_UPSTREAM := $(shell echo "$(VERSION_COMPLETE)" | sed -e 's,^[0-9]*:,,' -e 's,-[^-]*$$,,')
@@ -27,9 +30,9 @@
BUILD_DIR = debian/build
STAMPS_DIR = debian/stamps
-CFLAGS_UDEB := $(CFLAGS)
ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-CFLAGS_UDEB = -g -Os
+CFLAGS_OPT_DEB = -O2
+CFLAGS_OPT_UDEB = -Os
endif
CONFIGURE_FLAGS = --build $(DEB_BUILD_GNU_TYPE)
@@ -68,10 +71,10 @@
rm -rf $(DIR)
cp -a '$(SOURCE_DIR)' '$(DIR)'
cd $(DIR); \
- ./configure CFLAGS="$(CFLAGS)" \
+ ./configure CFLAGS="$(CPPFLAGS) $(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
$(CONFIGURE_FLAGS) \
--libdir=\$${exec_prefix}/lib/$(DEB_HOST_MULTIARCH) \
- --with-optimisation="" \
+ --with-optimisation="$(CFLAGS_OPT_DEB)" \
--with-clvmd=cman,corosync,openais \
--with-cluster=internal \
--with-device-uid=0 \
@@ -92,9 +95,9 @@
rm -rf $(DIR)
cp -a '$(SOURCE_DIR)' '$(DIR)'
cd $(DIR); \
- ./configure CFLAGS="$(CFLAGS_UDEB)" \
+ ./configure CFLAGS="$(CPPFLAGS) $(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
$(CONFIGURE_FLAGS) \
- --with-optimisation="" \
+ --with-optimisation="$(CFLAGS_OPT_UDEB)" \
--with-cluster=none \
--with-lvm1=none \
--with-pool=none \
More information about the pkg-lvm-commits
mailing list