r10032 - in /desktop/unstable/pygtk/debian: changelog rules

lool at users.alioth.debian.org lool at users.alioth.debian.org
Mon Apr 16 11:04:36 UTC 2007


Author: lool
Date: Mon Apr 16 11:04:36 2007
New Revision: 10032

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=10032
Log:
* Only pass --host to configure if DEB_HOST_GNU_TYPE and DEB_BUILD_GNU_TYPE
  differ.
* Cleanups.

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

Modified: desktop/unstable/pygtk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygtk/debian/changelog?rev=10032&op=diff
==============================================================================
--- desktop/unstable/pygtk/debian/changelog (original)
+++ desktop/unstable/pygtk/debian/changelog Mon Apr 16 11:04:36 2007
@@ -1,4 +1,4 @@
-pygtk (2.10.4-2) UNRELEASED; urgency=low
+pygtk (2.10.4-2) unstable; urgency=low
 
   * Honor CFLAGS we set in rules, doh!
   * Set some sane default CFLAGS and honor noopt in DEB_BUILD_OPTIONS.
@@ -6,8 +6,11 @@
   * Upload to unstable; drop check-dist include.
   * Fix URL in copyright.
   * Add XS and XB-Python-Version.
-
- -- Loic Minier <lool at dooz.org>  Mon, 16 Apr 2007 12:59:41 +0200
+  * Only pass --host to configure if DEB_HOST_GNU_TYPE and DEB_BUILD_GNU_TYPE
+    differ.
+  * Cleanups.
+
+ -- Loic Minier <lool at dooz.org>  Mon, 16 Apr 2007 13:02:48 +0200
 
 pygtk (2.10.4-1) experimental; urgency=low
 

Modified: desktop/unstable/pygtk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygtk/debian/rules?rev=10032&op=diff
==============================================================================
--- desktop/unstable/pygtk/debian/rules (original)
+++ desktop/unstable/pygtk/debian/rules Mon Apr 16 11:04:36 2007
@@ -1,19 +1,18 @@
 #!/usr/bin/make -f
+
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
+CFLAGS += -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2)
+
 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
+configure_flags += --prefix=/usr --enable-thread --build=$(DEB_BUILD_GNU_TYPE)
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
+ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+	configure_flags += --host=$(DEB_HOST_GNU_TYPE)
 endif
 
 PYVERS := $(shell pyversions --requested --version debian/control)
@@ -24,10 +23,7 @@
 	mkdir -p build-$*
 	cd build-$* && \
 		PYTHON=/usr/bin/python$* CFLAGS="$(CFLAGS)" \
-			../configure --host=$(DEB_HOST_GNU_TYPE) \
-				--build=$(DEB_BUILD_GNU_TYPE) \
-				--prefix=/usr \
-				--enable-thread
+			$(CURDIR)/configure $(configure_flags)
 	touch $@
 
 build-%/build-stamp: build-%/configure-stamp




More information about the pkg-gnome-commits mailing list