diff options
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rwxr-xr-x | debian/rules | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 477b95f..be01cc9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -qt4-x11 (4.3.3-2) UNRELEASED; urgency=low +qt4-x11 (4.3.3-2) unstable; urgency=low * Update 0203-qtexthtmlparser-link-color qt-copy patch: Add qt-bugs@ issue and Trolltech task ID. @@ -7,7 +7,7 @@ qt4-x11 (4.3.3-2) UNRELEASED; urgency=low * Downgrade libqt4-dev dependency to qt4-dev-tools from Recommends to Suggests. * Add semicolon at the end of the MimeType key. Thanks to Pino Toscano. - * Revert build with --as-needed linker flag: + * Remove 91_qmake_ldflags_as-needed patch: It breaks other packages. (Closes: #457038, #457284) * Add 91_qmake_lflags_no-undefined patch: By default, qmake adds --no-undefined linker flag. diff --git a/debian/rules b/debian/rules index 69cbabf..f721ae2 100755 --- a/debian/rules +++ b/debian/rules @@ -4,6 +4,7 @@ export QTDIR := $(shell pwd) export PATH := $(QTDIR)/bin:$(PATH) export LD_LIBRARY_PATH := $(QTDIR)/lib:$(LD_LIBRARY_PATH) export CXXFLAGS := -fpermissive +export LDFLAGS := -Wl,--no-undefined -Wl,--as-needed QTVERSION := $(shell ls changes-* | cut -f2 -d '-') CURRENTVERSION := $(shell head -1 debian/changelog | sed 's/[^(]*(\([^)]*\)).*/\1/') @@ -35,7 +36,7 @@ ifeq ($(DEB_HOST_ARCH),arm) EXTRA_CONFIGURE_OPTS += -DQT_QLOCALE_USES_FCVT endif -DEB_CONFIGURE_SCRIPT_ENV += CXXFLAGS="-fpermissive" +DEB_CONFIGURE_SCRIPT_ENV += CXXFLAGS="-fpermissive" LDFLAGS="-Wl,--no-undefined -Wl,--as-needed" ifeq ($(DEB_HOST_ARCH_OS),linux) PLATFORM_ARG = linux-g++ |