diff options
| author | Sune Vuorela <sune@vuorela.dk> | 2014-08-07 21:26:35 +0200 |
|---|---|---|
| committer | Sune Vuorela <sune@vuorela.dk> | 2014-08-07 21:26:35 +0200 |
| commit | d470b038998fa4b28b06705f6509815c7d1dd130 (patch) | |
| tree | 0ac9c2c1d66c30e660a33cddd7df62d6a04673b8 /debian | |
| parent | e7cfd673df6d7dc2993114653bce651b463c94e1 (diff) | |
| download | qt5webkit-d470b038998fa4b28b06705f6509815c7d1dd130.tar.gz | |
Link with -rt on hurd and kfreebsd. #757161
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/patches/fix_nonlinux_glibc_linkage.diff | 16 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 23 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index aabfacc..a3d5e02 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +qtwebkit-opensource-src (5.3.1+dfsg-2.1) UNRELEASED; urgency=medium + + * Link with -rt on hurd and kfreebsd. #757161 + + -- Sune Vuorela <sune@debian.org> Thu, 07 Aug 2014 21:24:25 +0200 + qtwebkit-opensource-src (5.3.1+dfsg-2) unstable; urgency=medium * Add hppa_wtf-dtoa-utils.diff to solve a FTBFS in HPPA (Closes: #753409). diff --git a/debian/patches/fix_nonlinux_glibc_linkage.diff b/debian/patches/fix_nonlinux_glibc_linkage.diff new file mode 100644 index 0000000..566389a --- /dev/null +++ b/debian/patches/fix_nonlinux_glibc_linkage.diff @@ -0,0 +1,16 @@ +Author: Sune Vuorela +Description: Ensures we link with rt on all the platforms where we +have glibc. Not yet upstreamed. Requires a upstreamming of the gnukfreebsd patch +Index: b/Source/WebKit2/WebKit2.pri +=================================================================== +--- a/Source/WebKit2/WebKit2.pri ++++ b/Source/WebKit2/WebKit2.pri +@@ -75,7 +75,7 @@ + + INCLUDEPATH += $$WEBKIT2_GENERATED_SOURCES_DIR + +-linux-*:!android { ++linux-*:!android|hurd-*|gnukfreebsd-* { + # -lrt is required for shm_open and shm_unlink. + LIBS += -lrt + } diff --git a/debian/patches/series b/debian/patches/series index 56ad92f..ffb1f9e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -7,3 +7,4 @@ no_gc_sections.diff hurd.diff webkit_qt_hide_symbols.diff hppa_wtf-dtoa-utils.diff +fix_nonlinux_glibc_linkage.diff |