Merge PR #5: Build gcc 9 and fix install path

This commit is contained in:
Jenkins nymea 2021-09-06 09:04:37 +02:00
commit 1d2a525a56
4 changed files with 17 additions and 18 deletions

13
debian/control vendored
View File

@ -4,7 +4,6 @@ Priority: optional
Maintainer: Simon Stürz <simon.stuerz@nymea.io>
Build-Depends: debhelper (>= 9.0.0),
dpkg-dev (>= 1.16.1~),
qt5-default,
qt5-qmake,
qtbase5-dev,
qtbase5-dev-tools
@ -13,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.
@ -30,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.

14
debian/rules vendored
View File

@ -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

View File

@ -15,5 +15,5 @@ HEADERS += \
SOURCES += main.cpp \
application.cpp
target.path = /usr/bin
target.path = $$[QT_INSTALL_PREFIX]/bin
INSTALLS += target

View File

@ -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