[SCM] Debian packaging for apr branch, master, updated. 228510f6c6a1761c1e85f07013f80921a2bf637a

[Stefan Fritsch]

The following commit has been merged in the master branch:
commit e7f32a697a86c29a72e63c053e76fd767588d2e4
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Sat May 11 14:17:40 2013 +0200

    Remove the ancient ino_t configure sanity test

diff --git a/debian/changelog b/debian/changelog
index 82d97ab..fde0738 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 apr (1.4.6-4) UNRELEASED; urgency=low
 
   * Make the /dev/shm sanity check during build work if it is a symbolic link.
+  * Remove the ancient ino_t configure sanity test that causes a FTBFS on x32.
+    Closes: #701193
 
  -- Stefan Fritsch <sf at debian.org>  Wed, 15 Aug 2012 19:58:25 +0200
 
diff --git a/debian/ino_t_test.c b/debian/ino_t_test.c
deleted file mode 100644
index 5378382..0000000
--- a/debian/ino_t_test.c
+++ /dev/null
@@ -1,22 +0,0 @@
-#include <stdio.h>
-#include <sys/types.h>
-#include "apr_file_info.h"
-
-/* this was the old definition of apr_ino_t until 1.2.11-1 */
-#if defined(__alpha__) || defined(__FreeBSD_kernel__)
-typedef unsigned int              old_apr_ino_t;
-#else
-typedef unsigned long int         old_apr_ino_t;
-#endif
-
-int main (void)
-{
-	size_t s0 = sizeof(apr_ino_t), s1 = sizeof(old_apr_ino_t);
-	if (s0 == s1)
-		return 0;
-	fprintf(stderr, "***\n"
-			"*** 'apr_ino_t' size is %zu, expected %zu\n"
-			"*** Please report this to the Debian Apache maintainers\n"
-			"***\n", s0, s1);
-	return 1;
-}
diff --git a/debian/rules b/debian/rules
index df9c076..a40c5b7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -69,11 +69,6 @@ $(BUILDDIR)/config.status:
 	# /bin/sh -> /bin/bash, the resulting libtool will not work on systems
 	# where /bin/sh -> /bin/dash
 	cd $(BUILDDIR) && CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" $(CONFFLAGS) CONFIG_SHELL=/bin/bash /bin/bash ../configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --enable-layout=Debian --includedir=\$${prefix}/usr/include/apr-1.0 --with-installbuilddir=\$${prefix}/usr/share/apr-1.0/build  --enable-nonportable-atomics --enable-allocator-uses-mmap
-	# Determine whether upstream's configure gives the same definition of apr_ino_t as we had until 1.2.11-1
-	rm -f debian/ino_t_test
-	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 (hurd, $(DEB_BUILD_ARCH_OS))
 	# multicast not supported on Hurd
 	sed -i '/HAVE_STRUCT_IPMREQ/ d' $(BUILDDIR)/include/arch/unix/apr_private.h
@@ -108,7 +103,7 @@ build-stamp: $(BUILDDIR)/config.status
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp test-stamp debian/ino_t_test
+	rm -f build-stamp test-stamp
 	rm -f configure build/lt* build/libtool.m4 build-outputs.mk include/arch/unix/apr_private.h.in
 	rm -rf $(BUILDDIR)
 

-- 
Debian packaging for apr