r9962 - in /desktop/unstable/pango1.0/debian: changelog rules

[lool at users.alioth.debian.org]

Author: lool
Date: Sat Apr 14 14:41:54 2007
New Revision: 9962

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=9962
Log:
* Set sane default CFLAGS; pass debian/rules' CFLAGS and LDFLAGS to
  configure, doh!
* Cleanups.

Modified:
    desktop/unstable/pango1.0/debian/changelog
    desktop/unstable/pango1.0/debian/rules

Modified: desktop/unstable/pango1.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/changelog?rev=9962&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/changelog (original)
+++ desktop/unstable/pango1.0/debian/changelog Sat Apr 14 14:41:54 2007
@@ -11,8 +11,11 @@
   * Wrap build-deps and deps.
   * Add ${misc:Depends}.
   * Add hint for vim that debian/pango.defoma is Perl.
-
- -- Loic Minier <lool at dooz.org>  Sat, 14 Apr 2007 16:26:57 +0200
+  * Set sane default CFLAGS; pass debian/rules' CFLAGS and LDFLAGS to
+    configure, doh!
+  * Cleanups.
+
+ -- Loic Minier <lool at dooz.org>  Sat, 14 Apr 2007 16:30:10 +0200
 
 pango1.0 (1.16.1-1) experimental; urgency=low
 

Modified: desktop/unstable/pango1.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/rules?rev=9962&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/rules (original)
+++ desktop/unstable/pango1.0/debian/rules Sat Apr 14 14:41:54 2007
@@ -17,16 +17,7 @@
 # the childs encounters this line
 MAKEFLAGS += $(if $(DEB_BUILD_OPTIONS_PARALLEL),-j2 $(DEB_BUILD_OPTIONS_PARALLEL))
 
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
+CFLAGS += -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2)
 
 # Ensure the build aborts when there are still references to undefined
 # symbols
@@ -40,6 +31,9 @@
 APIVER := 1.0
 SONAME := 0
 MODVER := 1.6.0
+
+DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 # relative libdir
 ifneq (,$(findstring multiarch,$(DEB_BUILD_OPTIONS)))
@@ -99,12 +93,13 @@
 			--mandir=\$${prefix}/share/man \
 			--infodir=\$${prefix}/share/info \
 			--with-html-dir=\$${prefix}/share/doc/$(DOC_PKG) \
-			--sysconfdir=/etc
-ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
-	common_configure_flags += --build=$(DEB_BUILD_GNU_TYPE)
-else
-	common_configure_flags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
+			--sysconfdir=/etc \
+			--build=$(DEB_BUILD_GNU_TYPE)
+
+ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+	common_configure_flags += --host=$(DEB_HOST_GNU_TYPE)
 endif
+
 shared_configure_flags := $(common_configure_flags) \
 			--enable-shared \
 			--disable-static
@@ -145,7 +140,8 @@
 	dh_testdir
 	mkdir -p $(builddir)
 	cd $(builddir) && \
-		$(CURDIR)/configure $($*_configure_flags)
+		CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
+			$(CURDIR)/configure $($*_configure_flags)
 	sed -i \
 		-e 's/^hardcode_libdir_flag_spec.*$$/hardcode_libdir_flag_spec=" -D__LIBTOOL_IS_A_FOOL__ "/' \
 		-e '/^archive_cmds="/s/"$$/ \\$$deplibs"/' \