[Build-common-hackers] Bug#287157: passes CFLAGS as argument to make instead of environmental variable

[Robert Millan]

This is a multi-part MIME message sent by reportbug.

--===============1948307400==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

Package: cdbs
Version: 0.4.26-1
Severity: important
Tags: patch

makefile-vars.mk should pass CFLAGS as an environmental variable.  Since it
doesn't, this breaks upstream packages that need to override or add flags
to that variable for a specific reason.

-- System Information:
Debian Release: 3.1
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: kfreebsd-i386 (i386)
Kernel: GNU/kFreeBSD 5.3-2
Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968) (ignored: LC_ALL set to C)

-- no debconf information

--===============1948307400==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="cdbs.diff"

--- /usr/share/cdbs/1/class/makefile-vars.mk	2004-12-20 15:30:49.000000000 +0100
+++ debian/makefile-vars.mk	2004-12-25 03:42:28.000000000 +0100
@@ -30,7 +30,7 @@
 include $(_cdbs_class_path)/langcore.mk$(_cdbs_makefile_suffix)
 
 DEB_MAKE_ENVVARS = 
-DEB_MAKE_INVOKE = $(DEB_MAKE_ENVVARS) make -C $(DEB_BUILDDIR) CFLAGS=$(if $(CFLAGS_$(cdbs_curpkg)),"$(CFLAGS_$(cdbs_curpkg))","$(CFLAGS)") CXXFLAGS=$(if $(CXXFLAGS_$(cdbs_curpkg)),"$(CXXFLAGS_$(cdbs_curpkg))","$(CXXFLAGS)") 
+DEB_MAKE_INVOKE = $(DEB_MAKE_ENVVARS) CFLAGS=$(if $(CFLAGS_$(cdbs_curpkg)),"$(CFLAGS_$(cdbs_curpkg))","$(CFLAGS)") CXXFLAGS=$(if $(CXXFLAGS_$(cdbs_curpkg)),"$(CXXFLAGS_$(cdbs_curpkg))","$(CXXFLAGS)") make -C $(DEB_BUILDDIR)
 
 # This variable is deprecated.
 DEB_BUILD_MAKE_TARGET = 

--===============1948307400==--