[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#685882: unblock: zoneminder/1.25.0-2



On Sat, Aug 25, 2012 at 14:37:34 -0700, Vagrant Cascadian wrote:

> diff -Nru zoneminder-1.25.0/debian/rules zoneminder-1.25.0/debian/rules
> --- zoneminder-1.25.0/debian/rules	2011-12-12 14:48:18.000000000 -0800
> +++ zoneminder-1.25.0/debian/rules	2012-08-23 13:27:54.000000000 -0700
> @@ -17,21 +17,18 @@
>  DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
>  DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
>  
> -CFLAGS = -Wall -g
> -CPPFLAGS = -D__STDC_CONSTANT_MACROS
> -CXXFLAGS = -DZM_FFMPEG_CVS -DHAVE_LIBCRYPTO
> -
> -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
> -	CFLAGS += -O0
> -else
> -	CFLAGS += -O2
> -endif
> +CFLAGS = $(shell dpkg-buildflags --get CFLAGS)
> +CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS)
> +CXXFLAGS = $(shell dpkg-buildflags --get CXXFLAGS)
> +CFLAGS += -Wall -g
> +CPPFLAGS += -D__STDC_CONSTANT_MACROS
> +CXXFLAGS += -DZM_FFMPEG_CVS -DHAVE_LIBCRYPTO
>  
>  %:
>  	dh $@ --with autoreconf
>  
>  override_dh_auto_configure:
> -	CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --sysconfdir=/etc/zm --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --with-mysql=/usr  --with-webdir=/usr/share/zoneminder --with-ffmpeg=/usr --with-cgidir=/usr/lib/cgi-bin --with-webuser=www-data --with-webgroup=www-data --enable-crashtrace=no --enable-mmap=yes
> +	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --sysconfdir=/etc/zm --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --with-mysql=/usr  --with-webdir=/usr/share/zoneminder --with-ffmpeg=/usr --with-cgidir=/usr/lib/cgi-bin --with-webuser=www-data --with-webgroup=www-data --enable-crashtrace=no --enable-mmap=yes
>  
How are the build flags passed to configure?  They don't seem to be
explicitly exported, and you removed them from the configure cmdline.

Cheers,
Julien

Attachment: signature.asc
Description: Digital signature


Reply to: