diff options
| author | Pino Toscano <pino@debian.org> | 2011-12-30 13:17:11 +0100 |
|---|---|---|
| committer | Pino Toscano <pino@debian.org> | 2011-12-30 13:17:11 +0100 |
| commit | dbf11da14a631417922d18b9435727d70ed79409 (patch) | |
| tree | 95674f38426d9f7002e8efa90b904e15e48f80fb | |
| parent | 22b5bdabfa513f90808a8e4283ae48317ab655bb (diff) | |
| download | qtwebkit-dbf11da14a631417922d18b9435727d70ed79409.tar.gz | |
add patch hurd.diff to temporarly workaround build failure on Hurd
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/patches/hurd.diff | 29 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 31 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index ddc2d6f..4dcc1cd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ qtwebkit (2.2.0-3) UNRELEASED; urgency=low * Update the symbols file for ia64 and mipsel architectures. [ Pino Toscano ] + * Add patch hurd.diff to temporarly workaround build failure on Hurd. * Update the symbols file for hurd-i386, sh4, and sparc64 architectures. -- Fathi Boudra <fabo@debian.org> Wed, 28 Dec 2011 10:10:59 +0200 diff --git a/debian/patches/hurd.diff b/debian/patches/hurd.diff new file mode 100644 index 0000000..83d4866 --- /dev/null +++ b/debian/patches/hurd.diff @@ -0,0 +1,29 @@ +Author: Pino Toscano <pino@debian.org> +Description: fix (workaround) build on GNU/Hurd + Apparently PTHREAD_MUTEX_NORMAL and PTHREAD_MUTEX_DEFAULT cannot be used + in preprocessor expressions, so temporarly use directly the code which would + be used on GNU/Hurd. +Origin: vendor +Forwarded: not-needed +Last-Update: 2011-12-30 + +--- a/Source/JavaScriptCore/wtf/FastMalloc.cpp ++++ b/Source/JavaScriptCore/wtf/FastMalloc.cpp +@@ -1595,6 +1595,9 @@ + void TCMalloc_PageHeap::initializeScavenger() + { + // Create a non-recursive mutex. ++#if defined(__GNU__) ++ pthread_mutex_init(&m_scavengeMutex, 0); ++#else + #if !defined(PTHREAD_MUTEX_NORMAL) || PTHREAD_MUTEX_NORMAL == PTHREAD_MUTEX_DEFAULT + pthread_mutex_init(&m_scavengeMutex, 0); + #else +@@ -1606,6 +1609,7 @@ + + pthread_mutexattr_destroy(&attr); + #endif ++#endif + + pthread_cond_init(&m_scavengeCondition, 0); + m_scavengeThreadActive = true; diff --git a/debian/patches/series b/debian/patches/series index b2d2bc4..d0b4dc5 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -12,3 +12,4 @@ no_gc_sections.diff #linux_amd64_no_overcommit.diff defines_qt_webkit.diff glibc_mkspec.diff +hurd.diff |