From 096643395b85f89ebacb02e47f99533a97123762 Mon Sep 17 00:00:00 2001 From: Eberhard Beilharz Date: Tue, 7 Feb 2023 11:19:55 +0100 Subject: [PATCH] fix(linux): Fix autopkgtests Autopkgtests couldn't find pkg-config, so this change adds that as test dependency. (cherry picked from commit 71462d9705f95515e962b3894daef9a3f7987d2e) --- linux/debian/control | 4 ++-- linux/debian/tests/control | 4 +++- linux/debian/tests/test-build | 6 +++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/linux/debian/control b/linux/debian/control index c00fe70307..33f50a90dc 100644 --- a/linux/debian/control +++ b/linux/debian/control @@ -37,8 +37,8 @@ Build-Depends: metacity, gawk, Standards-Version: 4.6.1 -Vcs-Git: https://github.com/keymanapp/keyman.git [linux/debian] -Vcs-Browser: https://github.com/keymanapp/keyman/tree/master/linux/debian +Vcs-Git: https://github.com/keymanapp/keyman.git -b stable-16.0 [linux/debian] +Vcs-Browser: https://github.com/keymanapp/keyman/tree/stable-16.0/linux/debian Homepage: https://www.keyman.com Rules-Requires-Root: binary-targets diff --git a/linux/debian/tests/control b/linux/debian/tests/control index 32cf9dac3f..af7e864b97 100644 --- a/linux/debian/tests/control +++ b/linux/debian/tests/control @@ -1,2 +1,4 @@ Tests: test-build -Depends: @, build-essential +Depends: @, + build-essential, + pkg-config, diff --git a/linux/debian/tests/test-build b/linux/debian/tests/test-build index f53496e17a..e92b018796 100644 --- a/linux/debian/tests/test-build +++ b/linux/debian/tests/test-build @@ -7,7 +7,7 @@ set -e WORKDIR=$(mktemp -d) trap "rm -rf $WORKDIR" 0 INT QUIT ABRT PIPE TERM -cd $WORKDIR +cd "$WORKDIR" # Test all include files are available cat < keymantest.c @@ -15,7 +15,7 @@ cat < keymantest.c km_kbp_context c; EOF -gcc keymantest.c `pkg-config --cflags --libs keyman_kmn_processor` +gcc keymantest.c "$(pkg-config --cflags --libs keyman_kmn_processor)" echo "build 1: OK" # Test pkg-config file - include without path @@ -24,5 +24,5 @@ cat < keymantest.c km_kbp_context c; EOF -gcc keymantest.c `pkg-config --cflags --libs keyman_kmn_processor` +gcc keymantest.c "$(pkg-config --cflags --libs keyman_kmn_processor)" echo "build 2: OK"