[SCM] qtbase packaging branch, master, updated. debian/5.0.2+dfsg1-2-18-g473fc70
Pino Toscano
pino at alioth.debian.org
Fri Apr 26 12:40:07 UTC 2013
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=473fc70
The following commit has been merged in the master branch:
commit 473fc703d337bbb39444f818570f39aacdff6b26
Author: Pino Toscano <pino at debian.org>
Date: Fri Apr 26 14:39:52 2013 +0200
drop check of old hppa kernel bug
it has been fixed many years ago
---
debian/changelog | 1 +
debian/readdir-hppa-test.c | 25 -------------------------
debian/rules | 18 ------------------
3 files changed, 1 insertions(+), 43 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 6e24aa2..93a7a8d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ qtbase-opensource-src (5.0.2+dfsg1-4) UNRELEASED; urgency=low
[ Pino Toscano ]
* Update lintian overrides.
+ * Drop check of old hppa kernel bug, which has been fixed many years ago.
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Fri, 26 Apr 2013 13:21:51 +0200
diff --git a/debian/readdir-hppa-test.c b/debian/readdir-hppa-test.c
deleted file mode 100644
index eb893ba..0000000
--- a/debian/readdir-hppa-test.c
+++ /dev/null
@@ -1,25 +0,0 @@
-#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
", entry.d_name);
- if (return_code != 0)
- perror("readdir_r() error");
- closedir(dir);
- }
-}
-
diff --git a/debian/rules b/debian/rules
index 92f42af..af01227 100755
--- a/debian/rules
+++ b/debian/rules
@@ -88,21 +88,6 @@ endif
dh $@ --parallel --with pkgkde_symbolshelper
override_dh_auto_configure:
- # 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/src/images && $(CURDIR)/debian/hppa-tmp/hppa-test-program | sort > $(CURDIR)/debian/hppa-tmp/readdir_r-out
- cd $(CURDIR)/doc/src/images && 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 Qt 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++
@@ -177,9 +162,6 @@ override_dh_auto_clean:
plugins/ \
;
- # hppa test directory
- rm -rf debian/hppa-tmp
-
# Leftover dirs
find -depth -type d \( -false \
-o -name debug-shared \
--
qtbase packaging
More information about the pkg-kde-commits
mailing list