[SCM] qtbase packaging branch, ubuntu+1, updated. debian/5.8.0+dfsg-3-248-g9611408
Timo Jyrinki
timo at moszumanska.debian.org
Tue Apr 11 10:39:35 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=9611408
The following commit has been merged in the ubuntu+1 branch:
commit 96114084611ef6abb2f4aa2265dcee0f43b3ea6a
Author: Timo Jyrinki <timo at debian.org>
Date: Tue Apr 11 10:39:16 2017 +0000
Remove x86 -> armhf cross-compilation qmake, maybe something more generic can be done on Debian side and then synced to Ubuntu later, if needed.
---
debian/changelog | 2 +
debian/control | 29 --------
debian/patches/qt5-qmake-arm-linux-gnueabihf | 102 ---------------------------
debian/rules | 46 ------------
4 files changed, 2 insertions(+), 177 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 30254da..9e9f726 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ qtbase-opensource-src (5.8.0+dfsg-4) UNRELEASED; urgency=medium
- qnam-ubuntu-fix6.patch - not submitted upstream, but also might be
outdated
- skip-largefile-test-s390x.patch - likely not needed anymore
+ * Remove x86 -> armhf cross-compilation qmake, maybe something more generic
+ can be done on Debian side and then synced to Ubuntu later, if needed.
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Thu, 16 Feb 2017 11:40:03 +0300
diff --git a/debian/control b/debian/control
index 115892b..25c01a5 100644
--- a/debian/control
+++ b/debian/control
@@ -399,35 +399,6 @@ Description: Qt 5 qmake Makefile generator tool
.
This package contains also these platform specifications.
-Package: qt5-qmake-arm-linux-gnueabihf
-Architecture: amd64 i386
-Multi-Arch: same
-Section: devel
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: qt5-qmake-cross-armhf (<< 5.3.2+dfsg-4ubuntu5)
-Replaces: qt5-qmake-cross-armhf (<< 5.3.2+dfsg-4ubuntu5)
-Description: Qt 5 qt5-qmake-arm-linux-gnueabihf Makefile generator tool
- Qt is a cross-platform C++ application framework. Qt's primary feature
- is its rich set of widgets that provide standard GUI functionality.
- .
- This package contains the Qt 5 qt5-qmake-arm-linux-gnueabihf, a tool
- that helps simplify the build process for development project across
- different platforms.
- qmake-cross-armhf automates the generation of Makefiles so that only
- a few lines of information are needed to create each Makefile.
- qmake can be used for any software project, whether it is written
- using Qt or not.
- .
- Qt 5 qt5-qmake-arm-linux-gnueabihf requires a platform and compiler
- description file which contains many default values used to generate
- appropriate Makefiles.
- .
- This package contains also these platform specifications.
- .
- The qt5-qmake-arm-linux-gnueabihf is made for creating Makefile in
- multiarch build environment. It can be used for example in a i386 chroot
- with armhf development packages.
-
Package: qtbase5-examples
Architecture: any
Multi-Arch: foreign
diff --git a/debian/patches/qt5-qmake-arm-linux-gnueabihf b/debian/patches/qt5-qmake-arm-linux-gnueabihf
deleted file mode 100644
index 245d152..0000000
--- a/debian/patches/qt5-qmake-arm-linux-gnueabihf
+++ /dev/null
@@ -1,102 +0,0 @@
-Description: Add mkspec for the qt5-qmake-arm-linux-gnueabihf build
- .
- qtbase-opensource-src (5.3.0+dfsg-3ubuntu1) utopic; urgency=medium
- .
- * Add to support qmake projects in multiarch
- crossbuilders
-Author: Zoltán Balogh <zoltan at bakter.hu>
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: https://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- /dev/null
-+++ qtbase-opensource-src/mkspecs/ubuntu-arm-gnueabihf-g++/qmake.conf
-@@ -0,0 +1,33 @@
-+#
-+# qmake configuration for building with arm-linux-gnueabi-g++
-+#
-+
-+MAKEFILE_GENERATOR = UNIX
-+CONFIG += incremental
-+QMAKE_INCREMENTAL_STYLE = sublib
-+
-+include(../common/linux.conf)
-+include(../common/gcc-base-unix.conf)
-+include(../common/g++-unix.conf)
-+
-+# modifications to g++.conf
-+QMAKE_CC = arm-linux-gnueabihf-gcc
-+QMAKE_CXX = arm-linux-gnueabihf-g++
-+QMAKE_LINK = arm-linux-gnueabihf-g++
-+QMAKE_LINK_SHLIB = arm-linux-gnueabihf-g++
-+QMAKE_CFLAGS_APP -= -fPIE
-+QMAKE_CFLAGS_APP += -fPIC
-+QMAKE_CXXFLAGS_APP -= -fPIE
-+QMAKE_CXXFLAGS_APP += -fPIC
-+
-+# modifications to linux.conf
-+QMAKE_AR = arm-linux-gnueabihf-ar cqs
-+QMAKE_OBJCOPY = arm-linux-gnueabihf-objcopy
-+QMAKE_NM = arm-linux-gnueabihf-nm -P
-+QMAKE_STRIP = arm-linux-gnueabihf-strip
-+QMAKE_LIBDIR = /usr/lib/arm-linux-gnueabihf
-+
-+ PKG_CONFIG = arm-linux-gnueabihf-pkg-config
-+
-+load(qt_config)
-+QMAKE_DEFAULT_INCDIRS = /usr/include/arm-linux-gnueabihf/c++/4.9 /usr/include/arm-linux-gnueabihf/c++/4.9/backward /usr/include/arm-linux-gnueabihf
---- /dev/null
-+++ qtbase-opensource-src/mkspecs/ubuntu-arm-gnueabihf-g++/qplatformdefs.h
-@@ -0,0 +1,42 @@
-+/****************************************************************************
-+**
-+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-+** Contact: http://www.qt-project.org/legal
-+**
-+** This file is part of the qmake spec of the Qt Toolkit.
-+**
-+** $QT_BEGIN_LICENSE:LGPL$
-+** Commercial License Usage
-+** Licensees holding valid commercial Qt licenses may use this file in
-+** accordance with the commercial license agreement provided with the
-+** Software or, alternatively, in accordance with the terms contained in
-+** a written agreement between you and Digia. For licensing terms and
-+** conditions see http://qt.digia.com/licensing. For further information
-+** use the contact form at http://qt.digia.com/contact-us.
-+**
-+** GNU Lesser General Public License Usage
-+** Alternatively, this file may be used under the terms of the GNU Lesser
-+** General Public License version 2.1 as published by the Free Software
-+** Foundation and appearing in the file LICENSE.LGPL included in the
-+** packaging of this file. Please review the following information to
-+** ensure the GNU Lesser General Public License version 2.1 requirements
-+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-+**
-+** In addition, as a special exception, Digia gives you certain additional
-+** rights. These rights are described in the Digia Qt LGPL Exception
-+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-+**
-+** GNU General Public License Usage
-+** Alternatively, this file may be used under the terms of the GNU
-+** General Public License version 3.0 as published by the Free Software
-+** Foundation and appearing in the file LICENSE.GPL included in the
-+** packaging of this file. Please review the following information to
-+** ensure the GNU General Public License version 3.0 requirements will be
-+** met: http://www.gnu.org/copyleft/gpl.html.
-+**
-+**
-+** $QT_END_LICENSE$
-+**
-+****************************************************************************/
-+
-+#include "../linux-g++/qplatformdefs.h"
diff --git a/debian/rules b/debian/rules
index 0d8d87f..12a9e27 100755
--- a/debian/rules
+++ b/debian/rules
@@ -85,47 +85,7 @@ endif
%:
dh $@ --parallel --with pkgkde_symbolshelper
-x86_architectures := i386 amd64
-
override_dh_auto_configure:
-ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(x86_architectures)))
- MAKEFLAGS="-j$(NUMJOBS) ${CXXFLAGS:%=EXTRA_CXXFLAGS+=%} ${LDFLAGS:%=EXTRA_LFLAGS+=%}" \
- ./configure \
- -confirm-license \
- -prefix "/usr" \
- -bindir "/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/bin" \
- -libdir "/usr/lib/arm-linux-gnueabihf" \
- -docdir "/usr/share/qt5/doc" \
- -headerdir "/usr/include/arm-linux-gnueabihf/qt5" \
- -datadir "/usr/share/qt5" \
- -archdatadir "/usr/lib/arm-linux-gnueabihf/qt5" \
- -hostdatadir "/usr/share/qt5" \
- -plugindir "/usr/lib/arm-linux-gnueabihf/qt5/plugins" \
- -importdir "/usr/lib/arm-linux-gnueabihf/qt5/imports" \
- -translationdir "/usr/share/qt5/translations" \
- -hostdatadir "/usr/lib/arm-linux-gnueabihf/qt5" \
- -sysconfdir "/etc/xdg" \
- -examplesdir "/usr/lib/arm-linux-gnueabihf/qt5/examples" \
- -opensource \
- --no-dbus \
- --no-libjpeg \
- --no-glib \
- -platform linux-g++ \
- -qt-zlib \
- -no-rpath \
- -verbose \
- -optimized-qmake \
- -no-strip \
- -no-separate-debug-info \
- -qpa xcb \
- -xcb \
- -no-icu \
- -accessibility \
- -no-directfb \
- -no-sql-ibase -no-pch -no-opengl \
- -xplatform ubuntu-arm-gnueabihf-g++ || file $(CURDIR)/bin/qmake;
- mv $(CURDIR)/bin/qmake $(CURDIR)/bin/qt5-qmake-arm-linux-gnueabihf
-endif
MAKEFLAGS="-j$(NUMJOBS) ${CXXFLAGS:%=EXTRA_CXXFLAGS+=%} ${LDFLAGS:%=EXTRA_LFLAGS+=%}" \
./configure \
-confirm-license \
@@ -305,12 +265,6 @@ endif
mkdir -p $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qtchooser
ln -s /usr/share/qtchooser/qt5-$(DEB_HOST_MULTIARCH).conf $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qtchooser/default.conf
-ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(x86_architectures)))
- # ship the qt5-qmake-arm-linux-gnueabihf in /usr/bin
- mkdir -p $(CURDIR)/debian/tmp/usr/bin
- cp $(CURDIR)/bin/qt5-qmake-arm-linux-gnueabihf $(CURDIR)/debian/tmp/usr/bin
-endif
-
# Remove leftover directories
find $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5 -depth -type d \( -false \
-o -name .moc\* \
--
qtbase packaging
More information about the pkg-kde-commits
mailing list