r11785 - in /desktop/experimental/gtk+2.0/debian: changelog rules

[lool at users.alioth.debian.org]

Author: lool
Date: Tue Jul  3 17:03:45 2007
New Revision: 11785

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=11785
Log:
* Don't run the directfb testsuite on kfreebsd as it hangs; proposed patch
  by Petr Salinger; closes: #431477.

Modified:
    desktop/experimental/gtk+2.0/debian/changelog
    desktop/experimental/gtk+2.0/debian/rules

Modified: desktop/experimental/gtk+2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/changelog?rev=11785&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/changelog (original)
+++ desktop/experimental/gtk+2.0/debian/changelog Tue Jul  3 17:03:45 2007
@@ -1,3 +1,10 @@
+gtk+2.0 (2.11.5-2) UNRELEASED; urgency=low
+
+  * Don't run the directfb testsuite on kfreebsd as it hangs; proposed patch
+    by Petr Salinger; closes: #431477.
+
+ -- Loic Minier <lool at dooz.org>  Tue, 03 Jul 2007 18:59:23 +0200
+
 gtk+2.0 (2.11.5-1) experimental; urgency=low
 
   * New upstream development release, with API additions; the new API may

Modified: desktop/experimental/gtk+2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/rules?rev=11785&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/rules (original)
+++ desktop/experimental/gtk+2.0/debian/rules Tue Jul  3 17:03:45 2007
@@ -25,8 +25,7 @@
 DEB_BUILD_OPTIONS_PARALLEL ?= $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 MAKEFLAGS += $(if $(DEB_BUILD_OPTIONS_PARALLEL),-j$(DEB_BUILD_OPTIONS_PARALLEL))
 
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
+DEB_HOST_ARCH_OS   ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 DEB_BUILD_GNU_CPU  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
@@ -34,6 +33,7 @@
 # ppc64 support; see #386815
 # XXX Should probably be fixed in binutils
 # XXX Use LDFLAGS instead of CFLAGS?
+# XXX shouldn't we check the arch instead of the CPU?
 ifeq ($(DEB_BUILD_GNU_CPU),powerpc64)
 	CFLAGS += -mminimal-toc
 endif
@@ -80,7 +80,12 @@
 FLAVORS := directfb shared static
 
 # list of flavors to run the test suite on
+# don't run the directfb testsuite on kfreebsd as it hangs; see #431477
+ifeq ($(DEB_HOST_ARCH_OS), kfreebsd)
+CHECK_FLAVORS := $(filter shared static, $(FLAVORS))
+else
 CHECK_FLAVORS := $(filter directfb shared static, $(FLAVORS))
+endif
 
 # build dir for the current flavor; this is only expanded in flavor specific
 # targets