diff options
author | Fathi Boudra <fabo@debian.org> | 2010-05-20 11:55:44 +0300 |
---|---|---|
committer | Fathi Boudra <fabo@debian.org> | 2010-05-20 11:55:44 +0300 |
commit | d3ee0a2305f2f442c93c956e17b450f7017670b9 (patch) | |
tree | f68dc8c7cbc7fe10ceca95b2584bf3f3627b37df | |
parent | 9468ebfb9bc2aa5e774b5e92aa91534dd4caed81 (diff) | |
download | qt4-x11-d3ee0a2305f2f442c93c956e17b450f7017670b9.tar.gz |
Revert "Update debian/rules: add -arch armv6 configure option on armel"
This reverts commit 9468ebfb9bc2aa5e774b5e92aa91534dd4caed81.
-rw-r--r-- | debian/changelog | 7 | ||||
-rwxr-xr-x | debian/rules | 4 |
2 files changed, 0 insertions, 11 deletions
diff --git a/debian/changelog b/debian/changelog index 382f7f5..709e401 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,3 @@ -qt4-x11 (4:4.6.2-6) UNRELEASED; urgency=low - - * Update debian/rules: add -arch armv6 configure option on armel - architecture to use armv6 specific files (defines QT_ARCH_ARMV6). - - -- Fathi Boudra <fabo@debian.org> Thu, 20 May 2010 10:43:58 +0300 - qt4-x11 (4:4.6.2-5) unstable; urgency=low [ Modestas Vainius ] diff --git a/debian/rules b/debian/rules index 51b435a..e04e4fb 100755 --- a/debian/rules +++ b/debian/rules @@ -34,10 +34,6 @@ ifeq ($(DEB_HOST_ARCH),arm) extra_configure_opts += -DQT_QLOCALE_USES_FCVT endif -ifeq ($(DEB_HOST_ARCH),armel) - extra_configure_opts += -arch armv6 -endif - ifeq ($(DEB_HOST_ARCH_OS),linux) ifeq ($(DEB_HOST_ARCH),amd64) platform_arg = linux-g++-64 |