Merge branch 'master' into rewrite-assertions-again

.cirrus.yml

@@ -8,10 +8,11 @@ main_freebsd_task:
   name: Main (FreeBSD)
   only_if: $CIRRUS_BRANCH == 'master' || $CIRRUS_BASE_BRANCH == 'master'
   dependencies_script:
-    - pkg install --yes autoconf automake libtool
+    - pkg install --yes autoconf automake cppcheck libtool libyaml py39-pip py39-wheel python3
+    - pip install --user Jinja2 PyYAML
   main_build_script:
     - ./autogen.sh
-    - ./configure --enable-debug --enable-checks --enable-checks-pthreads CFLAGS='-O3'
+    - ./configure --enable-debug --enable-checks-all CFLAGS='-O3'
     - make
     - sudo make install
   main_test_script:

.github/workflows/main.yml

@@ -76,7 +76,7 @@ jobs:
       - name: autogen
         run: ./autogen.sh
       - name: configure
-        run: ./configure --host='${{matrix.cross.arch}}-unknown-elf' --enable-checks --enable-checks-pthreads --enable-checks-python AR='${{matrix.cross.cprefix}}ar' CC='${{matrix.cross.cprefix}}gcc' LD='${{matrix.cross.cprefix}}ld' RANLIB='${{matrix.cross.cprefix}}ranlib'
+        run: ./configure --host='${{matrix.cross.arch}}-unknown-elf' --enable-checks --enable-checks-pthreads --enable-checks-python CC='${{matrix.cross.cprefix}}gcc'
       - name: make
         run: make
       - name: check
@@ -121,7 +121,7 @@ jobs:
       - name: autogen
         run: ./autogen.sh
       - name: configure
-        run: ./configure --host='i386-elf' ${{matrix.debug}} --enable-freestanding --with-libc AR="$(which i686-linux-gnu-ar)" CC="$(which i686-linux-gnu-gcc)" LD="$(which i686-linux-gnu-ld)" RANLIB="$(which i686-linux-gnu-ranlib)"
+        run: ./configure --host='i386-elf' ${{matrix.debug}} --enable-freestanding --with-libc CC="$(which i686-linux-gnu-gcc)"
       - name: make
         run: make
 

.openbsd.yml

@@ -0,0 +1,39 @@
+# We use sourcehut CI (https://builds.sr.ht) to test on OpenBSD.
+# For GNU/Linux CI see GitHub Actions.
+
+image: openbsd/7.2
+arch: amd64
+sources:
+  - https://github.com/tailix/libkernaux.git
+packages:
+  - autoconf-2.71
+  - automake-1.16.5
+  - cppcheck
+  - libyaml
+  - m4
+  - py3-pip
+  - py3-wheel
+  - python3
+  - wget
+environment:
+  AUTOCONF_VERSION: '2.71'
+  AUTOMAKE_VERSION: '1.16'
+tasks:
+  - libtool: |
+      wget https://ftpmirror.gnu.org/libtool/libtool-2.4.7.tar.gz
+      tar -xzf libtool-2.4.7.tar.gz
+      cd libtool-2.4.7
+      ./configure
+      make
+      doas make install
+  - dependencies: |
+      pip3 install --user Jinja2 PyYAML
+  - build: |
+      cd libkernaux
+      ./autogen.sh
+      ./configure --enable-debug --enable-checks-all CFLAGS='-O3'
+      make
+      doas make install
+  - test: |
+      cd libkernaux
+      make check

ChangeLog

@@ -1,3 +1,7 @@
+2022-12-13  Alex Kotov  <kotovalexarian@gmail.com>
+
+	* tests/Makefile.am: Fix FreeBSD builds
+
 2022-12-12  Alex Kotov  <kotovalexarian@gmail.com>
 
 	* examples/Makefile.am: Fix builds without pthreads

README.md

@@ -212,11 +212,12 @@ without it in `$PATH`:
   --host='i386-elf' \
   --enable-freestanding \
   --with-libc \
-  AR="$(which i386-elf-ar)" \
-  CC="$(which i386-elf-gcc)" \
-  RANLIB="$(which i386-elf-ranlib)"
+  CC="$(which i386-elf-gcc)"
 ```
 
+The variables include `AR`, `AS`, `CC`, `CCAS`, `LD`, `NM`, `OBJDUMP`, `RANLIB`,
+`STRIP`. See the generated `config.log` for more information.
+
 To install into specific directory use full path: `DESTDIR="$(pwd)/dest" make
 install` instead of `DESTDIR=dest make install`.
 

configure.ac

@@ -319,10 +319,8 @@ AS_IF([test "$enable_freestanding" = yes],
 ##############
 
 AC_LANG([C])
-
-AM_PROG_AR
 AM_PROG_AS
-AC_PROG_CC
+
 AC_C_INLINE
 
 AC_HEADER_STDBOOL

make/checks.am

@@ -20,9 +20,11 @@ CPPCHECK_INC = \
   -I$(top_srcdir)/include
 
 CPPCHECK_SUPPRESS = \
-  --suppress='constArgument:$(top_srcdir)/examples/macro_cast.c' \
-  --suppress='unusedStructMember:$(top_srcdir)/examples/*.c' \
-  --suppress='unusedStructMember:$(top_srcdir)/tests/test_multiboot2_info_*.c'
+  --suppress='constArgument:$(top_srcdir)/examples/macro_cast.c'               \
+  --suppress='constParameter:$(top_srcdir)/examples/printf_file*.c'            \
+  --suppress='unusedStructMember:$(top_srcdir)/examples/*.c'                   \
+  --suppress='unusedStructMember:$(top_srcdir)/tests/test_multiboot2_info_*.c' \
+  --suppress='unusedVariable'
 
 CPPCHECK_PATHS = \
   $(top_builddir)/examples \

tests/Makefile.am

@@ -104,7 +104,7 @@ endif
 CLEANFILES += test_cmdline_gen.c
 
 test_cmdline_gen.c: $(top_srcdir)/tests/cmdline_gen.py $(top_srcdir)/tests/cmdline_gen.jinja $(top_srcdir)/common/cmdline.yml
-	$(PYTHON) $+ $@
+	$(PYTHON) $(top_srcdir)/tests/cmdline_gen.py $(top_srcdir)/tests/cmdline_gen.jinja $(top_srcdir)/common/cmdline.yml test_cmdline_gen.c
 
 ############
 # test_elf #
@@ -338,7 +338,7 @@ endif
 CLEANFILES += test_printf_fmt_gen.c
 
 test_printf_fmt_gen.c: $(top_srcdir)/tests/printf_fmt_gen.py $(top_srcdir)/tests/printf_fmt_gen.jinja $(top_srcdir)/common/printf_fmt.yml
-	$(PYTHON) $+ $@
+	$(PYTHON) $(top_srcdir)/tests/printf_fmt_gen.py $(top_srcdir)/tests/printf_fmt_gen.jinja $(top_srcdir)/common/printf_fmt.yml test_printf_fmt_gen.c
 
 ###################
 # test_printf_gen #
@@ -361,7 +361,7 @@ endif
 CLEANFILES += test_printf_gen.c
 
 test_printf_gen.c: $(top_srcdir)/tests/printf_gen.py $(top_srcdir)/tests/printf_gen.jinja $(top_srcdir)/common/printf.yml $(top_srcdir)/common/printf_orig.yml
-	$(PYTHON) $+ $@
+	$(PYTHON) $(top_srcdir)/tests/printf_gen.py $(top_srcdir)/tests/printf_gen.jinja $(top_srcdir)/common/printf.yml $(top_srcdir)/common/printf_orig.yml test_printf_gen.c
 
 ####################
 # test_units_human #