rev 9560 - in branches/qt4-x11/debian: . patches
Fathi Boudra
fabo at alioth.debian.org
Tue Mar 4 07:18:29 UTC 2008
Author: fabo
Date: 2008-03-04 07:18:29 +0000 (Tue, 04 Mar 2008)
New Revision: 9560
Added:
branches/qt4-x11/debian/patches/09_qmake_lflags_as-needed.diff
Removed:
branches/qt4-x11/debian/patches/01_qmake_for_debian_with_link_prl.diff
Modified:
branches/qt4-x11/debian/changelog
branches/qt4-x11/debian/patches/01_qmake_for_debian.diff
branches/qt4-x11/debian/patches/series
branches/qt4-x11/debian/rules
Log:
Re-introduce link_prl previously removed by patch 01_qmake_for_debian
Remove LDFLAGS from rules as it isn't honored. Replaced patch
09_qmake_lflags_as-needed.
Ready for PART2: split Qt4
Modified: branches/qt4-x11/debian/changelog
===================================================================
--- branches/qt4-x11/debian/changelog 2008-03-04 01:11:49 UTC (rev 9559)
+++ branches/qt4-x11/debian/changelog 2008-03-04 07:18:29 UTC (rev 9560)
@@ -6,10 +6,11 @@
libpam0g-dev, libreadline5-dev, libxslt1-dev.
* Update rules:
* Disable DEB_INSTALL_CHANGELOGS_ALL.
- * Add DEB_DH_SHLIBDEPS_ARGS workaround for WebKit.
* Enable WebKit and XmlPatterns.
* Enable exceptions. It is a dependency to XmlPatterns module.
- * Refresh Debian patches.
+ * Refresh Debian patches:
+ * Re-introduce link_prl.
+ * Add patch to set --as-needed flag.
* Refresh qt-copy patches: 0167, 0172, 0178, 0180, 0191, 0192, 0195, 0203,
0209 and 0210.
* Add qt-copy patches: 0214, 0215 and 0216.
@@ -26,8 +27,6 @@
* Add packages: libqt4-dbus, libqt4-webkit and libqt4-xmlpatterns.
* Move QtDBus module from libqt4-core in libqt4-dbus package.
- * Experimental test to re-introduce link_prl.
-
-- Fathi Boudra <fabo at debian.org> Sat, 01 Mar 2008 18:31:24 +0100
qt4-x11 (4.3.4-1) unstable; urgency=low
Modified: branches/qt4-x11/debian/patches/01_qmake_for_debian.diff
===================================================================
--- branches/qt4-x11/debian/patches/01_qmake_for_debian.diff 2008-03-04 01:11:49 UTC (rev 9559)
+++ branches/qt4-x11/debian/patches/01_qmake_for_debian.diff 2008-03-04 07:18:29 UTC (rev 9560)
@@ -1,7 +1,6 @@
author: Brian Nelson <pyro at debian.org>
-Ensures qmake generates Makefiles that use the -qt4 tools and that use
-recursively link against all indirectly-used libraries.
+Ensures qmake generates Makefiles that use the -qt4 tools.
--- a/mkspecs/common/linux.conf
+++ b/mkspecs/common/linux.conf
@@ -16,16 +15,3 @@
QMAKE_AR = ar cqs
QMAKE_OBJCOPY = objcopy
---- a/mkspecs/linux-g++/qmake.conf
-+++ b/mkspecs/linux-g++/qmake.conf
-@@ -4,8 +4,9 @@
-
- MAKEFILE_GENERATOR = UNIX
- TEMPLATE = app
--CONFIG += qt warn_on release incremental link_prl
-+CONFIG += qt warn_on release incremental
- QT += core gui
-+DEFINES += QT_SHARED
- QMAKE_INCREMENTAL_STYLE = sublib
-
- include(../common/g++.conf)
Deleted: branches/qt4-x11/debian/patches/01_qmake_for_debian_with_link_prl.diff
Added: branches/qt4-x11/debian/patches/09_qmake_lflags_as-needed.diff
===================================================================
--- branches/qt4-x11/debian/patches/09_qmake_lflags_as-needed.diff (rev 0)
+++ branches/qt4-x11/debian/patches/09_qmake_lflags_as-needed.diff 2008-03-04 07:18:29 UTC (rev 9560)
@@ -0,0 +1,11 @@
+--- a/configure
++++ b/configure
+@@ -497,6 +497,8 @@
+ rm -f "$outpath/config.tests/.qmake.cache"
+ cp "$QMAKE_VARS_FILE" "$outpath/config.tests/.qmake.cache"
+
++QMakeVar add QMAKE_LFLAGS -Wl,--as-needed
++
+ QMakeVar add styles "cde mac motif plastique cleanlooks windows"
+ QMakeVar add decorations "default windows styled"
+ QMakeVar add gfx-drivers "linuxfb"
Modified: branches/qt4-x11/debian/patches/series
===================================================================
--- branches/qt4-x11/debian/patches/series 2008-03-04 01:11:49 UTC (rev 9559)
+++ branches/qt4-x11/debian/patches/series 2008-03-04 07:18:29 UTC (rev 9560)
@@ -14,14 +14,14 @@
0216-allow-isystem-for-headers.diff
# debian patches
-# 01_qmake_for_debian.diff
-01_qmake_for_debian_with_link_prl.diff
+01_qmake_for_debian.diff
03_launch_moc-qt4.diff
04_launch_uic-qt4.diff
05_append_qt4_target.diff
06_qtdemo_destdir.diff
07_trust_dpkg-arch_over_uname-m.diff
08_load_ssl.diff
+09_qmake_lflags_as-needed.diff
10_config_tests_fixes.diff
20_mips_atomic_ops.diff
40_alpha_ice.diff
Modified: branches/qt4-x11/debian/rules
===================================================================
--- branches/qt4-x11/debian/rules 2008-03-04 01:11:49 UTC (rev 9559)
+++ branches/qt4-x11/debian/rules 2008-03-04 07:18:29 UTC (rev 9560)
@@ -2,7 +2,6 @@
export QTDIR := $(shell pwd)
export PATH := $(QTDIR)/bin:$(PATH)
-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,8 +34,6 @@
EXTRA_CONFIGURE_OPTS += -DQT_QLOCALE_USES_FCVT
endif
-DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--no-undefined -Wl,--as-needed"
-
ifeq ($(DEB_HOST_ARCH_OS),linux)
PLATFORM_ARG = linux-g++
else
More information about the pkg-kde-commits
mailing list