[SCM] Qt 4 packaging branch, experimental, updated. debian/4.7.4-1-51-g6fb1d21
Fathi Boudra
fabo at alioth.debian.org
Thu Dec 29 15:05:58 UTC 2011
The following commit has been merged in the experimental branch:
commit 2d07d1b20a6438cb97664b61f2570cfdd59408de
Author: Fathi Boudra <fabo at debian.org>
Date: Thu Dec 29 17:03:41 2011 +0200
Revert the changes to fix build on alpha: Qt 4.7.4 built successfully using GCC 4.6.
---
debian/changelog | 1 -
debian/rules | 4 ----
2 files changed, 0 insertions(+), 5 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index d78eacc..b56d90c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -49,7 +49,6 @@ qt4-x11 (4:4.8.0-0multiarch1) UNRELEASED; urgency=low
- call mv-qt4-bin-dbg.sh to move the binaries in qt4-bin-dbg package.
- replace LDFLAGS by DEB_LDFLAGS_MAINT_APPEND usage.
- add -icu configure option.
- - build with -O1 on alpha architecture. (Closes: #648994)
* Update debian/*.install files:
- update paths for multiarch.
- headers, translations, qmlplugindump.
diff --git a/debian/rules b/debian/rules
index 9187e5d..1f4c3bb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,10 +7,6 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
export QTDIR := $(shell pwd)
export PATH := $(QTDIR)/bin:$(PATH)
-ifeq ($(DEB_HOST_ARCH),alpha)
-export DEB_CFLAGS_MAINT_APPEND=-O1
-export DEB_CXXFLAGS_MAINT_APPEND=-O1
-endif
export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
# workaround to use lrelease.
export LD_LIBRARY_PATH := $(QTDIR)/lib:$(LD_LIBRARY_PATH)
--
Qt 4 packaging
More information about the pkg-kde-commits
mailing list