Bug#859743: analitza: Please use C++ mode and Qt/KDE C++ flags for ABI check
Source: analitza
Version: 4:16.08.1-1
Severity: normal
Hi,
The attached patch makes acc autopkgtest use the qt/kde flags and also
uses C++ mode of abi-compliance-checker.
Cheers,
Balint
diff -Nru analitza-16.12.3/debian/libanalitza-dev.acc.in analitza-16.12.3/debian/libanalitza-dev.acc.in
--- analitza-16.12.3/debian/libanalitza-dev.acc.in 2017-03-10 21:29:13.000000000 +0000
+++ analitza-16.12.3/debian/libanalitza-dev.acc.in 2017-04-06 14:09:40.000000000 +0000
@@ -18,8 +18,9 @@
<gcc_options>
-fPIC
- -std=c++11
+ @@CPPFLAGS@@
+ @@CXXFLAGS@@
-fno-keep-inline-functions
</gcc_options>
-</descriptor>
\ No newline at end of file
+</descriptor>
diff -Nru analitza-16.12.3/debian/tests/acc analitza-16.12.3/debian/tests/acc
--- analitza-16.12.3/debian/tests/acc 2017-03-10 21:29:13.000000000 +0000
+++ analitza-16.12.3/debian/tests/acc 2017-04-06 14:09:40.000000000 +0000
@@ -2,10 +2,29 @@
DEB_HOST_MULTIARCH=$(dpkg-architecture -qDEB_HOST_MULTIARCH)
+# get qt/kde buildflags
+CPPFLAGS=$(make -s -f - all <<EOF
+include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
+include debian/dhmk_rules.mk
+all:
+ @echo "\$(CPPFLAGS)"
+EOF
+)
+CXXFLAGS=$(make -s -f - all <<EOF
+include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
+include debian/dhmk_rules.mk
+all:
+ @echo "\$(CXXFLAGS)"
+EOF
+)
+
for in_file in debian/*.acc.in; do
out_file=${in_file%.in}
- sed 's/@@DEB_HOST_MULTIARCH@@/'"${DEB_HOST_MULTIARCH}"'/' \
+ sed 's|@@DEB_HOST_MULTIARCH@@|'"${DEB_HOST_MULTIARCH}"'|;s|@@CXXFLAGS@@|'"${CXXFLAGS}"'|;s|@@CPPFLAGS@@|'"${CPPFLAGS}"'|;' \
"${in_file}" > "${out_file}"
done
-dh_acc
+# workaround for #859728
+cp $(which dh_acc) debian/
+sed -i 's/abi-compliance-checker -/abi-compliance-checker -cpp-compatible -/' debian/dh_acc
+debian/dh_acc
Reply to: