[Pkg-apache-commits] [SCM] Debian packaging for the apr (Apache Portable Runtime) package branch, master, updated. 77ded69e10a5a7749932f9f19e12ba0275a1534f

[Stefan Fritsch]

The following commit has been merged in the master branch:
commit d35d0ccb3391f4075a15a16be856bf639312b92c
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Sat May 19 15:49:28 2012 +0200

    Improvements for Hurd (closes: #656880):
    - Re-enable test suite
    - Update build hints, disable non-working shm and flock methods.

diff --git a/debian/changelog b/debian/changelog
index 55701f6..c27335c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 apr (1.4.6-2) UNRELEASED; urgency=low
 
+  * Improvements for Hurd (closes: #656880):
+    - Re-enable test suite
+    - Update build hints, disable non-working shm and flock methods. Thanks to
+      Pino Toscano for the patches.
   * Switch VCS to git.
   * Switch to source format 3.0, debhelper 9. Thanks to Jari Aalto for the
     patch. Closes: #664299
diff --git a/debian/patches/hurd_fix-hints.patch b/debian/patches/hurd_fix-hints.patch
new file mode 100644
index 0000000..085695c
--- /dev/null
+++ b/debian/patches/hurd_fix-hints.patch
@@ -0,0 +1,36 @@
+From: Pino Toscano <pino at debian.org>
+Bug: #656880
+# * hurd_fix-hints.diff
+# This patch, which could be sent upstream, fixes the set of predefined
+# hints for Hurd: usually the $host string is "i686-unknown-gnu0.3" or
+# "i486-pc-gnu", so the "GNU" string won't match anywhere; furthermore,
+# since the proposed string could be too broad (potentially matching
+# also the kFreeBSD string, e.g. "i686-unknown-kfreebsd8.2-gnu"), it has
+# been moved as very last check.
+#
+# committed upstream for 1.4.7
+
+Index: apr/build/apr_hints.m4
+===================================================================
+--- apr.orig/build/apr_hints.m4
++++ apr/build/apr_hints.m4
+@@ -129,9 +129,6 @@
+         esac
+ 	APR_ADDTO(CPPFLAGS, [-D_REENTRANT -D_GNU_SOURCE])
+ 	;;
+-    *-GNU*)
+-	APR_ADDTO(CPPFLAGS, [-DHURD -D_GNU_SOURCE])
+-	;;
+     *-lynx-lynxos)
+ 	APR_ADDTO(CPPFLAGS, [-D__NO_INCLUDE_WARN__ -DLYNXOS])
+ 	APR_ADDTO(LIBS, [-lbsd])
+@@ -479,6 +476,9 @@
+                 ;;
+         esac
+         ;;
++    *-*-gnu*)
++	APR_ADDTO(CPPFLAGS, [-D_REENTRANT -D_GNU_SOURCE])
++	;;
+   esac
+ 
+ fi
diff --git a/debian/patches/hurd_shm_flock.patch b/debian/patches/hurd_shm_flock.patch
new file mode 100644
index 0000000..312e085
--- /dev/null
+++ b/debian/patches/hurd_shm_flock.patch
@@ -0,0 +1,55 @@
+From: Pino Toscano <pino at debian.org>
+Bug: #656880
+
+# * hurd_shm_flock.diff
+# This patch disables all the methods for shared memory and file locking
+# found by the configure checks, forcing the only working ones.
+# This patch should stay Debian-specific, as it is not that suitable for
+# upstream inclusion. (As you can guess, ideally all of those
+# non-working methods should be ideally fixed in Hurd...)
+
+Index: apr/configure.in
+===================================================================
+--- apr.orig/configure.in
++++ apr/configure.in
+@@ -1188,6 +1188,13 @@
+         APR_DECISION_OVERRIDE(USE_SHMEM_SHMGET_ANON)
+         ;;
+ esac
++case $host_os in
++    gnu* )
++        haveshmgetanon="0"
++        havemmapanon="0"
++        APR_DECISION_OVERRIDE(USE_SHMEM_MMAP_ZERO)
++        ;;
++esac
+ APR_END_DECISION
+ AC_DEFINE_UNQUOTED($ac_decision)
+ 
+@@ -1256,6 +1263,13 @@
+         fi
+         ;;
+ esac
++case $host_os in
++    gnu* )
++        havemmapshm="0"
++        haveshmget="0"
++        APR_DECISION_OVERRIDE(USE_SHMEM_MMAP_TMP)
++        ;;
++esac
+ APR_END_DECISION
+ AC_DEFINE_UNQUOTED($ac_decision)
+ 
+@@ -2215,6 +2229,12 @@
+ if test "x$apr_lock_method" != "x"; then
+     APR_DECISION_FORCE($apr_lock_method)
+ fi
++case $host_os in
++    gnu* )
++        hasfcntlser="0"
++        APR_DECISION_OVERRIDE(USE_FLOCK_SERIALIZE)
++        ;;
++esac
+ APR_END_DECISION
+ AC_DEFINE_UNQUOTED($ac_decision)
+ 
diff --git a/debian/patches/series b/debian/patches/series
index e14bbe8..184025e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,5 @@ hurd_path_max.patch
 fix_doxygen.patch
 GNU_SOURCE_earlier.patch
 omit_extra_libs.patch
+hurd_shm_flock.patch
+hurd_fix-hints.patch
diff --git a/debian/rules b/debian/rules
index 6fe2be3..c10bbdf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -66,11 +66,6 @@ else
 	TEST_TARGET =
 endif
 
-# disable tests on hurd until they are fixed (#530286)
-ifeq (hurd, $(DEB_BUILD_ARCH_OS))
-	TEST_TARGET =
-endif
-
 SHELL=/bin/bash
 
 $(BUILDDIR)/config.status:

-- 
Debian packaging for the apr (Apache Portable Runtime) package