rev 8675 - trunk/packages/qt4-x11/debian

[Fathi Boudra]

Author: fabo
Date: 2007-12-31 06:54:07 +0000 (Mon, 31 Dec 2007)
New Revision: 8675

Modified:
   trunk/packages/qt4-x11/debian/changelog
   trunk/packages/qt4-x11/debian/rules
Log:
* Do not let qmake adds --as-needed by default only.


Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog	2007-12-30 22:55:31 UTC (rev 8674)
+++ trunk/packages/qt4-x11/debian/changelog	2007-12-31 06:54:07 UTC (rev 8675)
@@ -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 @@
   * 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.

Modified: trunk/packages/qt4-x11/debian/rules
===================================================================
--- trunk/packages/qt4-x11/debian/rules	2007-12-30 22:55:31 UTC (rev 8674)
+++ trunk/packages/qt4-x11/debian/rules	2007-12-31 06:54:07 UTC (rev 8675)
@@ -4,6 +4,7 @@
 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 @@
 	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++