From 70ec8280ade20019e95e335f5f27c23e499ca202 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Sun, 5 Sep 2021 12:58:29 +0200 Subject: [PATCH 1/3] Build gcc 9 and fix install path --- debian/control | 1 - nymea-gpio-tool/nymea-gpio-tool.pro | 2 +- nymea-gpio.pri | 6 ++++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index 06579e7..1d00878 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,6 @@ Maintainer: Simon Stürz Build-Depends: debhelper (>= 9.0.0), dpkg-dev (>= 1.16.1~), qt5-default, - qt5-qmake, qtbase5-dev, qtbase5-dev-tools Standards-Version: 3.9.7 diff --git a/nymea-gpio-tool/nymea-gpio-tool.pro b/nymea-gpio-tool/nymea-gpio-tool.pro index 2e6a605..99b0ec1 100644 --- a/nymea-gpio-tool/nymea-gpio-tool.pro +++ b/nymea-gpio-tool/nymea-gpio-tool.pro @@ -15,5 +15,5 @@ HEADERS += \ SOURCES += main.cpp \ application.cpp -target.path = /usr/bin +target.path = $$[QT_INSTALL_PREFIX]/bin INSTALLS += target diff --git a/nymea-gpio.pri b/nymea-gpio.pri index f6dcac7..c95128d 100644 --- a/nymea-gpio.pri +++ b/nymea-gpio.pri @@ -2,6 +2,12 @@ QMAKE_CXXFLAGS += -Werror -std=c++11 -g QMAKE_LFLAGS += -std=c++11 +gcc { + COMPILER_VERSION = $$system($$QMAKE_CXX " -dumpversion") + COMPILER_MAJOR_VERSION = $$str_member($$COMPILER_VERSION) + greaterThan(COMPILER_MAJOR_VERSION, 7): QMAKE_CXXFLAGS += -Wno-deprecated-copy +} + QT -= gui top_srcdir=$$PWD From c960a072270882ed8859d940d863918ccc91f9f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Sun, 5 Sep 2021 14:12:28 +0200 Subject: [PATCH 2/3] Fix build dependency --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 1d00878..28bbba9 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Simon Stürz Build-Depends: debhelper (>= 9.0.0), dpkg-dev (>= 1.16.1~), - qt5-default, + qt5-qmake, qtbase5-dev, qtbase5-dev-tools Standards-Version: 3.9.7 From febd6221c87efd2164ce01156c7c49a3db6d646c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Sun, 5 Sep 2021 15:00:55 +0200 Subject: [PATCH 3/3] Fix debian packaging --- debian/control | 12 ++---------- debian/rules | 14 ++++++++------ 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/debian/control b/debian/control index 28bbba9..9053ab8 100644 --- a/debian/control +++ b/debian/control @@ -12,6 +12,7 @@ Standards-Version: 3.9.7 Package: libnymea-gpio Section: libs Architecture: any +Multi-Arch: same Depends: ${shlibs:Depends}, ${misc:Depends} Description: Qt 5 based library for GPIO interaction. @@ -29,19 +30,10 @@ Description: Qt 5 based tool for GPIO interaction. Package: libnymea-gpio-dev Section: libdevel Architecture: any +Multi-Arch: same Depends: ${shlibs:Depends}, ${misc:Depends}, pkg-config, libnymea-gpio (= ${binary:Version}) Description: Qt 5 based library for GPIO interaction - development files Development files for Qt 5 based GPIO library. - -Package: libnymea-gpio-dbg -Priority: extra -Architecture: any -Section: debug -Depends: ${shlibs:Depends}, - ${misc:Depends}, - libnymea-gpio (= ${binary:Version}) -Description: Qt 5 based library for GPIO interaction - debug symbols - Debug Symbols for Qt 5 based GPIO library. diff --git a/debian/rules b/debian/rules index 50a3c52..2fa6fa9 100755 --- a/debian/rules +++ b/debian/rules @@ -1,22 +1,24 @@ #!/usr/bin/make -f +# -*- makefile -*- export DH_VERBOSE=1 + DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) +include /usr/share/dpkg/buildflags.mk + PREPROCESS_FILES := $(wildcard debian/*.in) $(PREPROCESS_FILES:.in=): %: %.in sed 's,/@DEB_HOST_MULTIARCH@,$(DEB_HOST_MULTIARCH:%=/%),g' $< > $@ -%: - dh $@ --buildsystem=qmake --parallel - override_dh_install: $(PREPROCESS_FILES:.in=) dh_install -override_dh_strip: - dh_strip --dbg-package=libnymea-gpio-dbg - override_dh_auto_clean: dh_auto_clean rm -rf $(PREPROCESS_FILES:.in=) + +%: + dh $@ --buildsystem=qmake --parallel +