rev 10044 - in branches/qt4-x11/debian: . patches

[Fathi Boudra]

Author: fabo
Date: 2008-04-07 07:47:02 +0000 (Mon, 07 Apr 2008)
New Revision: 10044

Added:
   branches/qt4-x11/debian/readdir-hppa-test.c
Modified:
   branches/qt4-x11/debian/changelog
   branches/qt4-x11/debian/patches/71_hppa_unaligned_access_fix_458133.diff
   branches/qt4-x11/debian/rules
Log:
Re-add hppa test. Removed by mistake.
hppa unaligned access patch doesn't fix the same issue.


Modified: branches/qt4-x11/debian/changelog
===================================================================
--- branches/qt4-x11/debian/changelog	2008-04-07 06:44:33 UTC (rev 10043)
+++ branches/qt4-x11/debian/changelog	2008-04-07 07:47:02 UTC (rev 10044)
@@ -46,8 +46,8 @@
     architectures listed first. (Closes: #473348)
   * Add architectures availability list to libqt4-sql-ibase package.
     (Closes: #473348)
-  * Add patch to fix unaligned access that cause a bus error on hppa.
-    Thanks to Bernhard R. Link. (Closes: #458133)
+  * Add patch to fix unaligned access on hppa. Thanks to Bernhard R. Link.
+    (Closes: #458133)
   * Add patch to replace remaining qdbus by dbus. Fix libqtscriptdbus build.
   * Update configure options:
     * Replace -qdbus by -dbus.

Modified: branches/qt4-x11/debian/patches/71_hppa_unaligned_access_fix_458133.diff
===================================================================
--- branches/qt4-x11/debian/patches/71_hppa_unaligned_access_fix_458133.diff	2008-04-07 06:44:33 UTC (rev 10043)
+++ branches/qt4-x11/debian/patches/71_hppa_unaligned_access_fix_458133.diff	2008-04-07 07:47:02 UTC (rev 10044)
@@ -1,6 +1,6 @@
 author: Bernhard R. Link <brlink at debian.org>
 
-Fix unaligned access that cause a bus error on hppa (ftbfs)
+Fix unaligned access on hppa
 
 --- a/src/corelib/global/qnumeric_p.h
 +++ b/src/corelib/global/qnumeric_p.h

Added: branches/qt4-x11/debian/readdir-hppa-test.c
===================================================================
--- branches/qt4-x11/debian/readdir-hppa-test.c	                        (rev 0)
+++ branches/qt4-x11/debian/readdir-hppa-test.c	2008-04-07 07:47:02 UTC (rev 10044)
@@ -0,0 +1,25 @@
+#include <sys/types.h>
+#include <dirent.h>
+#include <errno.h>
+#include <stdio.h>
+
+main() {
+  int return_code;
+  DIR *dir;
+  struct dirent entry;
+  struct dirent *result;
+
+  if ((dir = opendir(".")) == NULL)
+    perror("opendir() error");
+  else {
+ //   puts("contents of .:");
+    for (return_code = readdir_r(dir, &entry, &result);
+         result != NULL && return_code == 0;
+         return_code = readdir_r(dir, &entry, &result))
+      printf("%s\n", entry.d_name);
+    if (return_code != 0)
+      perror("readdir_r() error");
+    closedir(dir);
+  }
+}
+

Modified: branches/qt4-x11/debian/rules
===================================================================
--- branches/qt4-x11/debian/rules	2008-04-07 06:44:33 UTC (rev 10043)
+++ branches/qt4-x11/debian/rules	2008-04-07 07:47:02 UTC (rev 10044)
@@ -53,6 +53,21 @@
 common-configure-arch:: config.status
 
 config.status:
+	# Test broken hppa kernel with glibc >= 2.5
+ifeq ($(DEB_HOST_ARCH),hppa)
+	mkdir -p debian/hppa-tmp
+	echo "Testing whether getdents kernel bug is present on this buildd - see #433768"
+	gcc -o debian/hppa-tmp/hppa-test-program debian/readdir-hppa-test.c
+	cd $(CURDIR)/doc/html && $(CURDIR)/debian/hppa-tmp/hppa-test-program | sort > $(CURDIR)/debian/hppa-tmp/readdir_r-out
+	cd $(CURDIR)/doc/html && ls -a | sort > $(CURDIR)/debian/hppa-tmp/ls-a-out
+	@if ! diff -q $(CURDIR)/debian/hppa-tmp/readdir_r-out $(CURDIR)/debian/hppa-tmp/ls-a-out ; \
+		then \
+		echo "Kernel bug present. This will misbuild qt4 if proceeding. Failing" ; \
+		echo "Please update kernel and test again" ; \
+		exit 5 ; \
+	fi
+endif
+
 	# Create mkspecs/glibc-g++ from mkspecs/linux-g++, needed by GNU/kFreeBSD
 	# we cannot use directly linux-g++ due to src/corelib/io/io.pri
 	rm -rf mkspecs/glibc-g++
@@ -118,6 +133,9 @@
 	  plugins/ \
 	;
 	
+	# hppa test directory
+	rm -rf debian/hppa-tmp
+
 	# Leftover dirs
 	find -depth -type d \( -false \
 	  -o -name debug-shared \