[Pkg-apache-commits] r952 - in /trunk/apr: changelog patches/00list patches/025_GNU_SOURCE_earlier.dpatch rules

[sf at alioth.debian.org]

Author: sf
Date: Sun Jun  7 18:59:46 2009
New Revision: 952

URL: http://svn.debian.org/wsvn/pkg-apache/?sc=1&rev=952
Log:
fix hurd FTBFS

Added:
    trunk/apr/patches/025_GNU_SOURCE_earlier.dpatch   (with props)
Modified:
    trunk/apr/changelog
    trunk/apr/patches/00list
    trunk/apr/rules

Modified: trunk/apr/changelog
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apr/changelog?rev=952&op=diff
==============================================================================
--- trunk/apr/changelog (original)
+++ trunk/apr/changelog Sun Jun  7 18:59:46 2009
@@ -1,6 +1,11 @@
 apr (1.3.4-1) UNRELEASED; urgency=low
 
   * New upstream version
+  * Fix FTBFS on hurd (thanks to Marc Dequènes, closes: #530286)
+    - define _GNU_SOURCE earlier
+    - disable tests on hurd for now
+    - Deactivate missing multicast support on Hurd (by removing
+      HAVE_STRUCT_IPMREQ manually). 
 
  -- Stefan Fritsch <sf at debian.org>  Sat, 30 May 2009 17:30:06 +0200
 

Modified: trunk/apr/patches/00list
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apr/patches/00list?rev=952&op=diff
==============================================================================
--- trunk/apr/patches/00list (original)
+++ trunk/apr/patches/00list Sun Jun  7 18:59:46 2009
@@ -6,3 +6,4 @@
 022_hurd_path_max.dpatch
 023_fix_doxygen.dpatch
 024_hppa_flock_EWOULDBLOCK_weirdness.dpatch
+025_define_GNU_SOURCE_earlier.dpatch

Added: trunk/apr/patches/025_GNU_SOURCE_earlier.dpatch
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apr/patches/025_GNU_SOURCE_earlier.dpatch?rev=952&op=file
==============================================================================
--- trunk/apr/patches/025_GNU_SOURCE_earlier.dpatch (added)
+++ trunk/apr/patches/025_GNU_SOURCE_earlier.dpatch Sun Jun  7 18:59:46 2009
@@ -1,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 025_define_GNU_SOURCE_earlier.dpatch by Stefan Fritsch <sf at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: _GNU_SOURCE needs to be #defined before #including stuff
+## DP: (causing FTBFS on hurd, #530286)
+
+ at DPATCH@
+diff -urNad trunk~/include/apr.h.in trunk/include/apr.h.in
+--- trunk~/include/apr.h.in	2009-06-07 19:10:19.000000000 +0200
++++ trunk/include/apr.h.in	2009-06-07 20:50:52.261954142 +0200
+@@ -33,6 +33,10 @@
+  * for Win32 or Netware by those build environments, respectively.
+  */
+ 
++#ifndef _GNU_SOURCE
++# define _GNU_SOURCE 1
++#endif
++
+ /**
+  * @defgroup APR Apache Portability Runtime library
+  * @{

Propchange: trunk/apr/patches/025_GNU_SOURCE_earlier.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: trunk/apr/rules
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apr/rules?rev=952&op=diff
==============================================================================
--- trunk/apr/rules (original)
+++ trunk/apr/rules Sun Jun  7 18:59:46 2009
@@ -8,8 +8,9 @@
 
 # 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_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+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_SYSTEM ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM)
 
 BUILDDIR := build-$(DEB_HOST_GNU_TYPE)
 
@@ -47,6 +48,11 @@
 	TEST_TARGET =
 endif
 
+# disable tests on hurd until they are fixed (#530286)
+ifeq (gnu, $(DEB_BUILD_GNU_SYSTEM))
+	TEST_TARGET =
+endif
+
 SHELL=/bin/bash
 
 $(BUILDDIR)/config.status: patch-stamp
@@ -62,6 +68,10 @@
 	gcc -I$(CURDIR)/include -I$(BUILDDIR)/include `$(BUILDDIR)/apr-1-config --cppflags` -o debian/ino_t_test debian/ino_t_test.c
 	debian/ino_t_test
 	rm -f debian/ino_t_test
+ifeq (gnu, $(DEB_BUILD_GNU_SYSTEM))
+	# multicast not supported on Hurd
+	sed -i '/HAVE_STRUCT_IPMREQ/ d' $(BUILDDIR)/include/arch/unix/apr_private.h
+endif
 
 build: patch-stamp build-stamp