r16688 - in /desktop/unstable/vte/debian: changelog rules

[lool at users.alioth.debian.org]

Author: lool
Date: Sun Aug  3 13:52:53 2008
New Revision: 16688

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=16688
Log:
Manually overrides CFLAGS for udeb build instead of DEB_CONFIGURE_SCRIPT_ENV
trick relying on cdbs_curpkg -- this doesn't work as the target is
/config.status, not /<package>.

Modified:
    desktop/unstable/vte/debian/changelog
    desktop/unstable/vte/debian/rules

Modified: desktop/unstable/vte/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vte/debian/changelog?rev=16688&op=diff
==============================================================================
--- desktop/unstable/vte/debian/changelog (original)
+++ desktop/unstable/vte/debian/changelog Sun Aug  3 13:52:53 2008
@@ -23,8 +23,7 @@
   [ Loic Minier ]
   * Implement 25_enable_static_ncurses differently.
   * Drop dup --disable-maintainer-mode flag.
-  * Allow overriding CFLAGS per package as cdbs only allows this for the
-    makefile class.
+  * Override CFLAGS for udeb during configure.
   * Redisable udeb as the static linking approach isn't terribly good and wont
     work on !i386.
 

Modified: desktop/unstable/vte/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vte/debian/rules?rev=16688&op=diff
==============================================================================
--- desktop/unstable/vte/debian/rules (original)
+++ desktop/unstable/vte/debian/rules Sun Aug  3 13:52:53 2008
@@ -34,7 +34,6 @@
 DEB_DESTDIR := $(CURDIR)/debian/tmp/main
 DEB_DESTDIR_$(udeb) := $(CURDIR)/debian/tmp/udeb
 
-DEB_CONFIGURE_SCRIPT_ENV += CFLAGS=$(if $(CFLAGS_$(cdbs_curpkg)),"$(CFLAGS_$(cdbs_curpkg))","$(CFLAGS)")
 CFLAGS_$(udeb) += $(CFLAGS) -Os
 
 DEB_DH_INSTALL_ARGS = --sourcedir=$(if $(findstring $(udeb),$(cdbs_curpkg)),$(DEB_DESTDIR_$(udeb)),$(DEB_DESTDIR))
@@ -53,6 +52,7 @@
 	cd $(DEB_BUILDDIR_$(udeb)) && \
 		PKG_CONFIG_PATH=pkg-config \
 		$(DEB_CONFIGURE_SCRIPT_ENV) \
+		CFLAGS="$(CFLAGS_$(udeb))" \
 			$(DEB_CONFIGURE_SCRIPT) \
 				$(DEB_CONFIGURE_NORMAL_ARGS) \
 				$(cdbs_configure_flags) \