r9807 - in /desktop/unstable/glib2.0/debian: changelog rules

lool at users.alioth.debian.org lool at users.alioth.debian.org
Thu Apr 12 12:48:45 UTC 2007


Author: lool
Date: Thu Apr 12 12:48:45 2007
New Revision: 9807

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=9807
Log:
* Don't pass -g twice.

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

Modified: desktop/unstable/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/changelog?rev=9807&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/changelog (original)
+++ desktop/unstable/glib2.0/debian/changelog Thu Apr 12 12:48:45 2007
@@ -1,3 +1,10 @@
+glib2.0 (2.12.11-3) UNRELEASED; urgency=medium
+
+  * Initialize CFLAGS to -Wall -g; pass debian/rules' CFLAGS and LDFLAGS to
+    configure, doh!
+
+ -- Loic Minier <lool at dooz.org>  Thu, 12 Apr 2007 14:48:35 +0200
+
 glib2.0 (2.12.11-2) unstable; urgency=low
 
   * Run "make check" test suite for the deb flavor except if DEB_BUILD_OPTIONS

Modified: desktop/unstable/glib2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/rules?rev=9807&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/rules (original)
+++ desktop/unstable/glib2.0/debian/rules Thu Apr 12 12:48:45 2007
@@ -22,10 +22,12 @@
 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
+
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -g -O0
+	CFLAGS += -O0
 else
-	CFLAGS += -g -O2
+	CFLAGS += -O2
 endif
 
 # Ensure the build aborts when there are still references to undefined
@@ -103,7 +105,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"/' \




More information about the pkg-gnome-commits mailing list