5:11 p.m.
Effect of autoupdate, without changing the version.
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski(a)canonical.com>
---
configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index 25b12b9a85d8..a1f7bd8bf56a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
-AC_PREREQ(2.60)
-AC_INIT(neard, 0.17, [linux-nfc(a)lists.01.org])
+AC_PREREQ([2.60])
+AC_INIT([neard],[0.17],[linux-nfc(a)lists.01.org])
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([foreign subdir-objects color-tests])
--
2.30.2
5:11 p.m.
New subject: [neard][PATCH 2/8] build: replace deprecated AC_HELP_STRING
AC_HELP_STRING is deprecated in favor of AS_HELP_STRING at least since
autoconf v2.60. In autoconf v2.71 (used on current ArchLinux and Fedora
Rawhide) this causes error:
configure.ac:112: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:112: You should run autoupdate.
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski(a)canonical.com>
---
configure.ac | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/configure.ac b/configure.ac
index a1f7bd8bf56a..2cf9a19e4fab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -109,7 +109,7 @@ save_LIBS=$LIBS
AC_CHECK_LIB(asan, _init)
LIBS=$save_LIBS
-AC_ARG_ENABLE(asan, AC_HELP_STRING([--enable-asan],
+AC_ARG_ENABLE(asan, AS_HELP_STRING([--enable-asan],
[enable linking with address sanitizer]), [
if (test "${enableval}" = "yes" &&
test "${ac_cv_lib_asan__init}" = "yes" &&
@@ -123,7 +123,7 @@ save_LIBS=$LIBS
AC_CHECK_LIB(lsan, _init)
LIBS=$save_LIBS
-AC_ARG_ENABLE(lsan, AC_HELP_STRING([--enable-lsan],
+AC_ARG_ENABLE(lsan, AS_HELP_STRING([--enable-lsan],
[enable linking with leak sanitizer]), [
if (test "${enableval}" = "yes" &&
test "${ac_cv_lib_lsan__init}" = "yes" &&
@@ -137,7 +137,7 @@ save_LIBS=$LIBS
AC_CHECK_LIB(ubsan, _init)
LIBS=$save_LIBS
-AC_ARG_ENABLE(ubsan, AC_HELP_STRING([--enable-ubsan],
+AC_ARG_ENABLE(ubsan, AS_HELP_STRING([--enable-ubsan],
[enable linking with undefined behavior sanitizer]), [
if (test "${enableval}" = "yes" &&
test "${ac_cv_lib_ubsan__init}" = "yes" &&
--
2.30.2
5:11 p.m.
New subject: [neard][PATCH 3/8] ci: switch to dnf on Fedora
dnf is the new package manager on Fedora.
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski(a)canonical.com>
---
ci/fedora.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ci/fedora.sh b/ci/fedora.sh
index c5a67d237e91..f054f7d296d4 100755
--- a/ci/fedora.sh
+++ b/ci/fedora.sh
@@ -15,7 +15,7 @@ case $CC in
;;
esac
-yum -y install \
+dnf -y install \
autoconf \
autoconf-archive \
automake \
@@ -27,7 +27,7 @@ yum -y install \
$PKGS_CC
# Packages needed by CI
-yum -y install \
+dnf -y install \
file
echo "Install finished: $0"
--
2.30.2
5:11 p.m.
New subject: [neard][PATCH 4/8] ci: add more Fedora containers
Build in Fedora rawhide and in stable release containers.
Rawhide fails to install packages in two rounds (with two dnf/yum
commands), so combine these. Rawhide also needs explicit pkg-config as
it is not pulled in by other packages.
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski(a)canonical.com>
---
.github/workflows/ci.yml | 4 ++++
ci/fedora.sh | 13 ++++++++-----
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6a4eeedf3d66..cc977670e380 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -25,7 +25,11 @@ jobs:
- alpine:latest
- debian:testing
- debian:stable
+ # Fails on configure on GCC and clang (process restrictions?)
+ # - fedora:rawhide
- fedora:latest
+ - fedora:33
+ - fedora:32
- ubuntu:hirsute
- ubuntu:focal
- ubuntu:bionic
diff --git a/ci/fedora.sh b/ci/fedora.sh
index f054f7d296d4..f9ec67a15062 100755
--- a/ci/fedora.sh
+++ b/ci/fedora.sh
@@ -15,19 +15,22 @@ case $CC in
;;
esac
+# Packages needed by CI
+PKGS_MORE="file"
+
+# diffutils: Rawhide/35 needs "cmp" for configure
dnf -y install \
autoconf \
autoconf-archive \
automake \
dbus-devel \
+ diffutils \
glib2-devel \
libnl3-devel \
libtool \
make \
- $PKGS_CC
-
-# Packages needed by CI
-dnf -y install \
- file
+ pkg-config \
+ $PKGS_CC \
+ $PKGS_MORE
echo "Install finished: $0"
--
2.30.2
5:11 p.m.
New subject: [neard][PATCH 5/8] ci: add ArchLinux container
Build in ArchLinux latest container.
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski(a)canonical.com>
---
.github/workflows/ci.yml | 1 +
ci/archlinux.sh | 30 ++++++++++++++++++++++++++++++
2 files changed, 31 insertions(+)
create mode 100755 ci/archlinux.sh
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index cc977670e380..734969325692 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -23,6 +23,7 @@ jobs:
compiler: [gcc, clang]
container:
- alpine:latest
+ - archlinux:latest
- debian:testing
- debian:stable
# Fails on configure on GCC and clang (process restrictions?)
diff --git a/ci/archlinux.sh b/ci/archlinux.sh
new file mode 100755
index 000000000000..b08069ad2589
--- /dev/null
+++ b/ci/archlinux.sh
@@ -0,0 +1,30 @@
+#!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
+#
+# Copyright (c) 2021 Canonical Ltd.
+# Author: Krzysztof Kozlowski <krzysztof.kozlowski(a)canonical.com>
+# <krzk(a)kernel.org>
+#
+
+set -ex
+
+PKGS_CC="gcc"
+case $CC in
+ clang*)
+ PKGS_CC="clang"
+ ;;
+esac
+
+pacman -Sy --noconfirm \
+ autoconf \
+ autoconf-archive \
+ automake \
+ dbus \
+ glib2 \
+ libnl \
+ libtool \
+ make \
+ pkg-config \
+ $PKGS_CC
+
+echo "Install finished: $0"
--
2.30.2
5:11 p.m.
New subject: [neard][PATCH 6/8] ci: install pkg-config
Some newer distros (e.g. Fedora 35) might not pull pkg-config and print
confusing errors like:
configure.ac:61: error: possibly undefined macro: AC_MSG_ERROR
If this token and others are legitimate, please use m4_pattern_allow.
See the Autoconf documentation.
configure.ac:179: error: possibly undefined macro: AC_DEFINE
Configure explicitly uses pkg-config so install it always.
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski(a)canonical.com>
---
HACKING | 1 +
ci/alpine.sh | 1 +
ci/debian.sh | 1 +
3 files changed, 3 insertions(+)
diff --git a/HACKING b/HACKING
index 40bde2fb3c8b..db75f0d11a17 100644
--- a/HACKING
+++ b/HACKING
@@ -16,6 +16,7 @@ Required packages and tools:
libnl-3
libnl-genl-3
make
+ pkg-config
See also installation scripts for Continuous Integration in ci/ directory.
diff --git a/ci/alpine.sh b/ci/alpine.sh
index 56449dd7c969..bf87068228f3 100755
--- a/ci/alpine.sh
+++ b/ci/alpine.sh
@@ -33,6 +33,7 @@ apk add \
libtool \
make \
musl-dev \
+ pkgconfig \
$PKGS_CC
# Packages needed by CI
diff --git a/ci/debian.sh b/ci/debian.sh
index 962e554304ee..adb683eadf81 100755
--- a/ci/debian.sh
+++ b/ci/debian.sh
@@ -36,6 +36,7 @@ apt install -y --no-install-recommends \
libnl-genl-3-dev \
libtool \
make \
+ pkg-config \
$PKGS_CC
echo "Install finished: $0"
--
2.30.2
5:11 p.m.
New subject: [neard][PATCH 7/8] HACKING: rephrase message about dependencies
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski(a)canonical.com>
---
HACKING | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/HACKING b/HACKING
index db75f0d11a17..8207781f5519 100644
--- a/HACKING
+++ b/HACKING
@@ -18,7 +18,7 @@ Required packages and tools:
make
pkg-config
-See also installation scripts for Continuous Integration in ci/ directory.
+See also installation scripts for different systems in ci/ directory.
Working with the source code repository
--
2.30.2
5:11 p.m.
New subject: [neard][PATCH 8/8] ci: group package installation on Alpine
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski(a)canonical.com>
---
ci/alpine.sh | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/ci/alpine.sh b/ci/alpine.sh
index bf87068228f3..550bf86370bf 100755
--- a/ci/alpine.sh
+++ b/ci/alpine.sh
@@ -20,6 +20,9 @@ case $CC in
;;
esac
+# Packages needed by CI
+PKGS_MORE="file"
+
# gzip: for distcheck
apk add \
autoconf \
@@ -34,10 +37,7 @@ apk add \
make \
musl-dev \
pkgconfig \
- $PKGS_CC
-
-# Packages needed by CI
-apk add \
- file
+ $PKGS_CC \
+ $PKGS_MORE
echo "Install finished: $0"
--
2.30.2
4:54 p.m.
On 22/09/2021 18:11, Krzysztof Kozlowski wrote:
Effect of autoupdate, without changing the version.
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski(a)canonical.com>
---
configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index 25b12b9a85d8..a1f7bd8bf56a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
-AC_PREREQ(2.60)
-AC_INIT(neard, 0.17, [linux-nfc(a)lists.01.org])
+AC_PREREQ([2.60])
+AC_INIT([neard],[0.17],[linux-nfc(a)lists.01.org])
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([foreign subdir-objects color-tests])
All applied to master in https://github.com/linux-nfc/neard
Best regards,
Krzysztof
278
days inactive
279
days old
8 comments
1 participants
participants (1)
-
Krzysztof Kozlowski