summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorDmitry Shachnev <mitya57@gmail.com>2017-07-04 14:13:14 +0300
committerDmitry Shachnev <mitya57@gmail.com>2017-07-04 14:13:14 +0300
commit64a5d5d5479bfec15e8f047dbb75e288d5796dd4 (patch)
tree7dcea9d38525832ba35a0244a5bd722a3e38dfad /debian
parentc3747fc920e46ec3b9f694fff336203354b0f592 (diff)
downloadqtbase-64a5d5d5479bfec15e8f047dbb75e288d5796dd4.tar.gz
Drop the workaround to not use gold on i386.
Bug https://bugs.debian.org/842304 should be fixed now.
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog2
-rwxr-xr-xdebian/rules5
2 files changed, 2 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog
index 108d38c..9ed6a98 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ qtbase-opensource-src (5.9.1+dfsg-3) UNRELEASED; urgency=medium
* Add a patch to use UTIME_NOW only if it is defined, to fix build on
kFreeBSD and Hurd (nonlinux_utime.diff).
* Update debian/libqt5gui5.symbols from buildds’ logs.
+ * Drop the workaround to not use gold on i386, bug #842304 should be
+ fixed now.
-- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Mon, 03 Jul 2017 15:27:25 +0300
diff --git a/debian/rules b/debian/rules
index 05e313b..dfa3a0f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -39,11 +39,6 @@ ifneq ($(DEB_HOST_ARCH_OS),$(findstring $(DEB_HOST_ARCH_OS), linux kfreebsd))
extra_configure_opts += -no-eglfs
endif
-# https://bugs.debian.org/842304
-ifeq ($(DEB_HOST_ARCH),i386)
- extra_configure_opts += -no-use-gold-linker
-endif
-
# Compile without sse2 support on i386
# Do not use pre compiled headers in order to be able to rebuild the gui
# submodule.