diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-24 04:52:22 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-24 04:52:22 +0000 |
| commit | 7f3caba522f4d24764f29d83aa2de9198bb7f01c (patch) | |
| tree | 66b798ea74302325d6a5c11df044cbe4bb845af1 /share/mk/configure | |
| parent | Adding upstream version 6.7. (diff) | |
| download | manpages-upstream.tar.xz manpages-upstream.zip | |
Adding upstream version 6.8.upstream/6.8upstream
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
67 files changed, 577 insertions, 235 deletions
diff --git a/share/mk/configure/build-depends/ld.mk b/share/mk/configure/build-depends/binutils/ld.mk index a78a189..687039f 100644 --- a/share/mk/configure/build-depends/ld.mk +++ b/share/mk/configure/build-depends/binutils/ld.mk @@ -2,17 +2,18 @@ # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception -ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_LD_INCLUDED -MAKEFILE_CONFIGURE_BUILD_DEPENDS_LD_INCLUDED := 1 +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_BINUTILS_LD_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_BINUTILS_LD_INCLUDED := 1 -include $(MAKEFILEDIR)/configure/build-depends/cc.mk -include $(MAKEFILEDIR)/configure/build-depends/coreutils.mk -include $(MAKEFILEDIR)/configure/build-depends/pkgconf.mk +include $(MAKEFILEDIR)/configure/build-depends/cpp/cpp.mk +include $(MAKEFILEDIR)/configure/build-depends/gcc/cc.mk +include $(MAKEFILEDIR)/configure/build-depends/coreutils/echo.mk +include $(MAKEFILEDIR)/configure/build-depends/pkgconf/pkgconf.mk include $(MAKEFILEDIR)/configure/verbose.mk -LD := $(CC) $(CFLAGS) +LD := $(CC) $(CPPFLAGS) $(CFLAGS) LD_HAS_FUSE_LINKER_PLUGIN := \ diff --git a/share/mk/configure/build-depends/bsdextrautils.mk b/share/mk/configure/build-depends/bsdextrautils/col.mk index 347e4bc..d7aeca2 100644 --- a/share/mk/configure/build-depends/bsdextrautils.mk +++ b/share/mk/configure/build-depends/bsdextrautils/col.mk @@ -2,8 +2,8 @@ # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception -ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_BSDEXTRAUTILS_INCLUDED -MAKEFILE_CONFIGURE_BUILD_DEPENDS_BSDEXTRAUTILS_INCLUDED := 1 +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_BSDEXTRAUTILS_COL_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_BSDEXTRAUTILS_COL_INCLUDED := 1 DEFAULT_COLFLAGS := \ diff --git a/share/mk/configure/build-depends/bzip2.mk b/share/mk/configure/build-depends/bzip2/bzip2.mk index 71e6366..ccc241a 100644 --- a/share/mk/configure/build-depends/bzip2.mk +++ b/share/mk/configure/build-depends/bzip2/bzip2.mk @@ -2,8 +2,8 @@ # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception -ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_BZIP2_INCLUDED -MAKEFILE_CONFIGURE_BUILD_DEPENDS_BZIP2_INCLUDED := 1 +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_BZIP2_BZIP2_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_BZIP2_BZIP2_INCLUDED := 1 DEFAULT_BZIP2FLAGS := diff --git a/share/mk/configure/build-depends/checkpatch.mk b/share/mk/configure/build-depends/checkpatch/checkpatch.mk index 0b29d9f..7100411 100644 --- a/share/mk/configure/build-depends/checkpatch.mk +++ b/share/mk/configure/build-depends/checkpatch/checkpatch.mk @@ -2,11 +2,11 @@ # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception -ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_CHECKPATCH_INCLUDED -MAKEFILE_CONFIGURE_BUILD_DEPENDS_CHECKPATCH_INCLUDED := 1 +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_CHECKPATCH_CHECKPATCH_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_CHECKPATCH_CHECKPATCH_INCLUDED := 1 -include $(MAKEFILEDIR)/configure/src.mk +include $(MAKEFILEDIR)/configure/directory_variables/src.mk CHECKPATCH_CONF := $(SYSCONFDIR)/checkpatch/checkpatch.conf diff --git a/share/mk/configure/build-depends/clang-tidy.mk b/share/mk/configure/build-depends/clang-tidy/clang-tidy.mk index 2d818f9..809215d 100644 --- a/share/mk/configure/build-depends/clang-tidy.mk +++ b/share/mk/configure/build-depends/clang-tidy/clang-tidy.mk @@ -2,11 +2,11 @@ # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception -ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_CLANG_TIDY_INCLUDED -MAKEFILE_CONFIGURE_BUILD_DEPENDS_CLANG_TIDY_INCLUDED := 1 +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_CLANG_TIDY_CLANG_TIDY_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_CLANG_TIDY_CLANG_TIDY_INCLUDED := 1 -include $(MAKEFILEDIR)/configure/src.mk +include $(MAKEFILEDIR)/configure/directory_variables/src.mk CLANG_TIDY_CONF := $(SYSCONFDIR)/clang-tidy/config.yaml diff --git a/share/mk/configure/build-depends/clang.mk b/share/mk/configure/build-depends/clang/clang.mk index b44ccb5..edb1254 100644 --- a/share/mk/configure/build-depends/clang.mk +++ b/share/mk/configure/build-depends/clang/clang.mk @@ -2,11 +2,11 @@ # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception -ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_CLANG_INCLUDED -MAKEFILE_CONFIGURE_BUILD_DEPENDS_CLANG_INCLUDED := 1 +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_CLANG_CLANG_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_CLANG_CLANG_INCLUDED := 1 -include $(MAKEFILEDIR)/configure/build-depends/cc.mk +include $(MAKEFILEDIR)/configure/build-depends/gcc/cc.mk DEFAULT_CLANGFLAGS := \ diff --git a/share/mk/configure/build-depends/coreutils.mk b/share/mk/configure/build-depends/coreutils.mk deleted file mode 100644 index 2fe97fe..0000000 --- a/share/mk/configure/build-depends/coreutils.mk +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 2022-2024, Alejandro Colomar <alx@kernel.org> -# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception - - -ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_COREUTILS_INCLUDED -MAKEFILE_CONFIGURE_BUILD_DEPENDS_COREUTILS_INCLUDED := 1 - - -CAT := cat -CP := cp -ECHO := echo -EXPR := expr -HEAD := head -INSTALL := install -LN := ln -MKDIR := mkdir -REALPATH := realpath -RM := rm -SORT := sort -STAT := stat -TAC := tac -TAIL := tail -TEST := test -TOUCH := touch -TRUE := true - - -INSTALL_DATA := $(INSTALL) -m 644 -INSTALL_DIR := $(INSTALL) -m 755 -d - - -endif # include guard diff --git a/share/mk/configure/build-depends/findutils.mk b/share/mk/configure/build-depends/coreutils/cat.mk index 536f921..fa96595 100644 --- a/share/mk/configure/build-depends/findutils.mk +++ b/share/mk/configure/build-depends/coreutils/cat.mk @@ -2,12 +2,11 @@ # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception -ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_FINDUTILS_INCLUDED -MAKEFILE_CONFIGURE_BUILD_DEPENDS_FINDUTILS_INCLUDED := 1 +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_COREUTILS_CAT_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_COREUTILS_CAT_INCLUDED := 1 -FIND := find -XARGS := xargs +CAT := cat endif # include guard diff --git a/share/mk/configure/build-depends/coreutils/cp.mk b/share/mk/configure/build-depends/coreutils/cp.mk new file mode 100644 index 0000000..64814dc --- /dev/null +++ b/share/mk/configure/build-depends/coreutils/cp.mk @@ -0,0 +1,12 @@ +# Copyright 2022-2024, Alejandro Colomar <alx@kernel.org> +# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception + + +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_COREUTILS_CP_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_COREUTILS_CP_INCLUDED := 1 + + +CP := cp + + +endif # include guard diff --git a/share/mk/configure/build-depends/coreutils/echo.mk b/share/mk/configure/build-depends/coreutils/echo.mk new file mode 100644 index 0000000..272d86c --- /dev/null +++ b/share/mk/configure/build-depends/coreutils/echo.mk @@ -0,0 +1,12 @@ +# Copyright 2022-2024, Alejandro Colomar <alx@kernel.org> +# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception + + +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_COREUTILS_ECHO_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_COREUTILS_ECHO_INCLUDED := 1 + + +ECHO := echo + + +endif # include guard diff --git a/share/mk/configure/build-depends/coreutils/expr.mk b/share/mk/configure/build-depends/coreutils/expr.mk new file mode 100644 index 0000000..18ca0e1 --- /dev/null +++ b/share/mk/configure/build-depends/coreutils/expr.mk @@ -0,0 +1,12 @@ +# Copyright 2022-2024, Alejandro Colomar <alx@kernel.org> +# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception + + +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_COREUTILS_EXPR_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_COREUTILS_EXPR_INCLUDED := 1 + + +EXPR := expr + + +endif # include guard diff --git a/share/mk/configure/build-depends/coreutils/head.mk b/share/mk/configure/build-depends/coreutils/head.mk new file mode 100644 index 0000000..a3fbb3e --- /dev/null +++ b/share/mk/configure/build-depends/coreutils/head.mk @@ -0,0 +1,12 @@ +# Copyright 2022-2024, Alejandro Colomar <alx@kernel.org> +# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception + + +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_COREUTILS_HEAD_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_COREUTILS_HEAD_INCLUDED := 1 + + +HEAD := head + + +endif # include guard diff --git a/share/mk/configure/build-depends/coreutils/install.mk b/share/mk/configure/build-depends/coreutils/install.mk new file mode 100644 index 0000000..ab7dbef --- /dev/null +++ b/share/mk/configure/build-depends/coreutils/install.mk @@ -0,0 +1,16 @@ +# Copyright 2022-2024, Alejandro Colomar <alx@kernel.org> +# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception + + +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_COREUTILS_INSTALL_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_COREUTILS_INSTALL_INCLUDED := 1 + + +INSTALL := install + + +INSTALL_DATA := $(INSTALL) -m 644 +INSTALL_DIR := $(INSTALL) -m 755 -d + + +endif # include guard diff --git a/share/mk/configure/build-depends/coreutils/ln.mk b/share/mk/configure/build-depends/coreutils/ln.mk new file mode 100644 index 0000000..a520de7 --- /dev/null +++ b/share/mk/configure/build-depends/coreutils/ln.mk @@ -0,0 +1,12 @@ +# Copyright 2022-2024, Alejandro Colomar <alx@kernel.org> +# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception + + +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_COREUTILS_LN_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_COREUTILS_LN_INCLUDED := 1 + + +LN := ln + + +endif # include guard diff --git a/share/mk/configure/build-depends/coreutils/mkdir.mk b/share/mk/configure/build-depends/coreutils/mkdir.mk new file mode 100644 index 0000000..77def5d --- /dev/null +++ b/share/mk/configure/build-depends/coreutils/mkdir.mk @@ -0,0 +1,12 @@ +# Copyright 2022-2024, Alejandro Colomar <alx@kernel.org> +# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception + + +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_COREUTILS_MKDIR_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_COREUTILS_MKDIR_INCLUDED := 1 + + +MKDIR := mkdir + + +endif # include guard diff --git a/share/mk/configure/build-depends/coreutils/realpath.mk b/share/mk/configure/build-depends/coreutils/realpath.mk new file mode 100644 index 0000000..7883f97 --- /dev/null +++ b/share/mk/configure/build-depends/coreutils/realpath.mk @@ -0,0 +1,12 @@ +# Copyright 2022-2024, Alejandro Colomar <alx@kernel.org> +# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception + + +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_COREUTILS_REALPATH_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_COREUTILS_REALPATH_INCLUDED := 1 + + +REALPATH := realpath + + +endif # include guard diff --git a/share/mk/configure/build-depends/coreutils/rm.mk b/share/mk/configure/build-depends/coreutils/rm.mk new file mode 100644 index 0000000..3c26518 --- /dev/null +++ b/share/mk/configure/build-depends/coreutils/rm.mk @@ -0,0 +1,12 @@ +# Copyright 2022-2024, Alejandro Colomar <alx@kernel.org> +# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception + + +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_COREUTILS_RM_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_COREUTILS_RM_INCLUDED := 1 + + +RM := rm + + +endif # include guard diff --git a/share/mk/configure/build-depends/coreutils/sort.mk b/share/mk/configure/build-depends/coreutils/sort.mk new file mode 100644 index 0000000..4871d54 --- /dev/null +++ b/share/mk/configure/build-depends/coreutils/sort.mk @@ -0,0 +1,12 @@ +# Copyright 2022-2024, Alejandro Colomar <alx@kernel.org> +# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception + + +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_COREUTILS_SORT_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_COREUTILS_SORT_INCLUDED := 1 + + +SORT := sort + + +endif # include guard diff --git a/share/mk/configure/build-depends/coreutils/stat.mk b/share/mk/configure/build-depends/coreutils/stat.mk new file mode 100644 index 0000000..a04c956 --- /dev/null +++ b/share/mk/configure/build-depends/coreutils/stat.mk @@ -0,0 +1,12 @@ +# Copyright 2022-2024, Alejandro Colomar <alx@kernel.org> +# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception + + +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_COREUTILS_STAT_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_COREUTILS_STAT_INCLUDED := 1 + + +STAT := stat + + +endif # include guard diff --git a/share/mk/configure/build-depends/coreutils/tac.mk b/share/mk/configure/build-depends/coreutils/tac.mk new file mode 100644 index 0000000..2ad296a --- /dev/null +++ b/share/mk/configure/build-depends/coreutils/tac.mk @@ -0,0 +1,12 @@ +# Copyright 2022-2024, Alejandro Colomar <alx@kernel.org> +# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception + + +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_COREUTILS_TAC_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_COREUTILS_TAC_INCLUDED := 1 + + +TAC := tac + + +endif # include guard diff --git a/share/mk/configure/build-depends/coreutils/tail.mk b/share/mk/configure/build-depends/coreutils/tail.mk new file mode 100644 index 0000000..514391e --- /dev/null +++ b/share/mk/configure/build-depends/coreutils/tail.mk @@ -0,0 +1,12 @@ +# Copyright 2022-2024, Alejandro Colomar <alx@kernel.org> +# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception + + +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_COREUTILS_TAIL_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_COREUTILS_TAIL_INCLUDED := 1 + + +TAIL := tail + + +endif # include guard diff --git a/share/mk/configure/build-depends/coreutils/test.mk b/share/mk/configure/build-depends/coreutils/test.mk new file mode 100644 index 0000000..1343fa6 --- /dev/null +++ b/share/mk/configure/build-depends/coreutils/test.mk @@ -0,0 +1,12 @@ +# Copyright 2022-2024, Alejandro Colomar <alx@kernel.org> +# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception + + +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_COREUTILS_TEST_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_COREUTILS_TEST_INCLUDED := 1 + + +TEST := test + + +endif # include guard diff --git a/share/mk/configure/build-depends/coreutils/touch.mk b/share/mk/configure/build-depends/coreutils/touch.mk new file mode 100644 index 0000000..2db533a --- /dev/null +++ b/share/mk/configure/build-depends/coreutils/touch.mk @@ -0,0 +1,12 @@ +# Copyright 2022-2024, Alejandro Colomar <alx@kernel.org> +# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception + + +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_COREUTILS_TOUCH_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_COREUTILS_TOUCH_INCLUDED := 1 + + +TOUCH := touch + + +endif # include guard diff --git a/share/mk/configure/build-depends/coreutils/true.mk b/share/mk/configure/build-depends/coreutils/true.mk new file mode 100644 index 0000000..2295c2f --- /dev/null +++ b/share/mk/configure/build-depends/coreutils/true.mk @@ -0,0 +1,12 @@ +# Copyright 2022-2024, Alejandro Colomar <alx@kernel.org> +# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception + + +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_COREUTILS_TRUE_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_COREUTILS_TRUE_INCLUDED := 1 + + +TRUE := true + + +endif # include guard diff --git a/share/mk/configure/build-depends/cpp.mk b/share/mk/configure/build-depends/cpp/cpp.mk index b720898..e1e2511 100644 --- a/share/mk/configure/build-depends/cpp.mk +++ b/share/mk/configure/build-depends/cpp/cpp.mk @@ -2,12 +2,12 @@ # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception -ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_CPP_INCLUDED -MAKEFILE_CONFIGURE_BUILD_DEPENDS_CPP_INCLUDED := 1 +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_CPP_CPP_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_CPP_CPP_INCLUDED := 1 -include $(MAKEFILEDIR)/configure/build-depends/cc.mk -include $(MAKEFILEDIR)/configure/build-depends/pkgconf.mk +include $(MAKEFILEDIR)/configure/build-depends/gcc/cc.mk +include $(MAKEFILEDIR)/configure/build-depends/pkgconf/pkgconf.mk include $(MAKEFILEDIR)/configure/verbose.mk diff --git a/share/mk/configure/build-depends/cppcheck.mk b/share/mk/configure/build-depends/cppcheck/cppcheck.mk index 93a9b75..2a5d844 100644 --- a/share/mk/configure/build-depends/cppcheck.mk +++ b/share/mk/configure/build-depends/cppcheck/cppcheck.mk @@ -2,11 +2,11 @@ # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception -ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_CPPCHECK_INCLUDED -MAKEFILE_CONFIGURE_BUILD_DEPENDS_CPPCHECK_INCLUDED := 1 +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_CPPCHECK_CPPCHECK_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_CPPCHECK_CPPCHECK_INCLUDED := 1 -include $(MAKEFILEDIR)/configure/src.mk +include $(MAKEFILEDIR)/configure/directory_variables/src.mk CPPCHECK_SUPPRESS := $(SYSCONFDIR)/cppcheck/cppcheck.suppress @@ -14,6 +14,7 @@ DEFAULT_CPPCHECKFLAGS := \ --enable=all \ --error-exitcode=2 \ --inconclusive \ + --check-level=exhaustive \ --quiet \ --suppressions-list=$(CPPCHECK_SUPPRESS) EXTRA_CPPCHECKFLAGS := diff --git a/share/mk/configure/build-depends/cpplint.mk b/share/mk/configure/build-depends/cpplint/cpplint.mk index 586d646..330315f 100644 --- a/share/mk/configure/build-depends/cpplint.mk +++ b/share/mk/configure/build-depends/cpplint/cpplint.mk @@ -2,11 +2,11 @@ # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception -ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_CPPLINT_INCLUDED -MAKEFILE_CONFIGURE_BUILD_DEPENDS_CPPLINT_INCLUDED := 1 +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_CPPLINT_CPPLINT_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_CPPLINT_CPPLINT_INCLUDED := 1 -include $(MAKEFILEDIR)/configure/src.mk +include $(MAKEFILEDIR)/configure/directory_variables/src.mk CPPLINT_CONF := $(SYSCONFDIR)/cpplint/cpplint.cfg diff --git a/share/mk/configure/build-depends/diffoscope.mk b/share/mk/configure/build-depends/diffoscope/diffoscope.mk index a9e48b3..032a0c6 100644 --- a/share/mk/configure/build-depends/diffoscope.mk +++ b/share/mk/configure/build-depends/diffoscope/diffoscope.mk @@ -2,8 +2,8 @@ # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception -ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_DIFFOSCOPE_INCLUDED -MAKEFILE_CONFIGURE_BUILD_DEPENDS_DIFFOSCOPE_INCLUDED := 1 +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_DIFFOSCOPE_DIFFOSCOPE_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_DIFFOSCOPE_DIFFOSCOPE_INCLUDED := 1 DIFFOSCOPE := diffoscope diff --git a/share/mk/configure/build-depends/findutils/find.mk b/share/mk/configure/build-depends/findutils/find.mk new file mode 100644 index 0000000..1525f0e --- /dev/null +++ b/share/mk/configure/build-depends/findutils/find.mk @@ -0,0 +1,12 @@ +# Copyright 2022-2024, Alejandro Colomar <alx@kernel.org> +# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception + + +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_FINDUTILS_FIND_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_FINDUTILS_FIND_INCLUDED := 1 + + +FIND := find + + +endif # include guard diff --git a/share/mk/configure/build-depends/findutils/xargs.mk b/share/mk/configure/build-depends/findutils/xargs.mk new file mode 100644 index 0000000..dffa009 --- /dev/null +++ b/share/mk/configure/build-depends/findutils/xargs.mk @@ -0,0 +1,12 @@ +# Copyright 2022-2024, Alejandro Colomar <alx@kernel.org> +# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception + + +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_FINDUTILS_XARGS_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_FINDUTILS_XARGS_INCLUDED := 1 + + +XARGS := xargs + + +endif # include guard diff --git a/share/mk/configure/build-depends/fontforge/fontforge.mk b/share/mk/configure/build-depends/fontforge/fontforge.mk new file mode 100644 index 0000000..f246df2 --- /dev/null +++ b/share/mk/configure/build-depends/fontforge/fontforge.mk @@ -0,0 +1,15 @@ +# Copyright 2024, Alejandro Colomar <alx@kernel.org> +# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception + + +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_FONTFORGE_FONTFORGE_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_FONTFORGE_FONTFORGE_INCLUDED := 1 + + +DEFAULT_FONTFORGEFLAGS := +EXTRA_FONTFORGEFLAGS := +FONTFORGEFLAGS := $(DEFAULT_FONTFORGEFLAGS) $(EXTRA_FONTFORGEFLAGS) +FONTFORGE := fontforge + + +endif # include guard diff --git a/share/mk/configure/build-depends/cc.mk b/share/mk/configure/build-depends/gcc/cc.mk index 85470a4..9481865 100644 --- a/share/mk/configure/build-depends/cc.mk +++ b/share/mk/configure/build-depends/gcc/cc.mk @@ -2,13 +2,13 @@ # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception -ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_CC_INCLUDED -MAKEFILE_CONFIGURE_BUILD_DEPENDS_CC_INCLUDED := 1 +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_GCC_CC_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_GCC_CC_INCLUDED := 1 -include $(MAKEFILEDIR)/configure/build-depends/coreutils.mk -include $(MAKEFILEDIR)/configure/build-depends/grep.mk -include $(MAKEFILEDIR)/configure/build-depends/sed.mk +include $(MAKEFILEDIR)/configure/build-depends/coreutils/echo.mk +include $(MAKEFILEDIR)/configure/build-depends/grep/grep.mk +include $(MAKEFILEDIR)/configure/build-depends/sed/sed.mk CC := gcc @@ -34,6 +34,8 @@ COMMON_CFLAGS := \ -Werror \ -Wstrict-prototypes \ -Wdeclaration-after-statement \ + -Wno-reserved-identifier \ + -Wno-unused-macros \ -Wno-error=unused-parameter \ -Wno-error=sign-compare \ -Wno-error=format \ diff --git a/share/mk/configure/build-depends/git.mk b/share/mk/configure/build-depends/git/git.mk index a861bed..29c3090 100644 --- a/share/mk/configure/build-depends/git.mk +++ b/share/mk/configure/build-depends/git/git.mk @@ -2,8 +2,8 @@ # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception -ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_GIT_INCLUDED -MAKEFILE_CONFIGURE_BUILD_DEPENDS_GIT_INCLUDED := 1 +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_GIT_GIT_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_GIT_GIT_INCLUDED := 1 GIT := git diff --git a/share/mk/configure/build-depends/grep.mk b/share/mk/configure/build-depends/grep/grep.mk index 7d89691..9b1afa5 100644 --- a/share/mk/configure/build-depends/grep.mk +++ b/share/mk/configure/build-depends/grep/grep.mk @@ -2,8 +2,8 @@ # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception -ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_GREP_INCLUDED -MAKEFILE_CONFIGURE_BUILD_DEPENDS_GREP_INCLUDED := 1 +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_GREP_GREP_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_GREP_GREP_INCLUDED := 1 GREP := grep diff --git a/share/mk/configure/build-depends/groff-base.mk b/share/mk/configure/build-depends/groff-base.mk deleted file mode 100644 index ab1f98d..0000000 --- a/share/mk/configure/build-depends/groff-base.mk +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 2024, Alejandro Colomar <alx@kernel.org> -# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception - - -ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_GROFF_BASE_INCLUDED -MAKEFILE_CONFIGURE_BUILD_DEPENDS_GROFF_BASE_INCLUDED := 1 - - -include $(MAKEFILEDIR)/configure/build-depends/coreutils.mk -include $(MAKEFILEDIR)/configure/build-depends/grep.mk -include $(MAKEFILEDIR)/configure/build-depends/libc-bin.mk -include $(MAKEFILEDIR)/configure/build-depends/man.mk - - -DEFAULT_PRECONVFLAGS := -EXTRA_PRECONVFLAGS := -PRECONVFLAGS := $(DEFAULT_PRECONVFLAGS) $(EXTRA_PRECONVFLAGS) -PRECONV := preconv - - -DEFAULT_PICFLAGS := -EXTRA_PICFLAGS := -PICFLAGS := $(DEFAULT_PICFLAGS) $(EXTRA_PICFLAGS) -PIC := pic - - -TBL := tbl - - -DEFAULT_EQNFLAGS := -EXTRA_EQNFLAGS := -EQNFLAGS := $(DEFAULT_EQNFLAGS) $(EXTRA_EQNFLAGS) -EQN := eqn - - -DEFAULT_TROFFFLAGS := -wbreak -EXTRA_TROFFFLAGS := -TROFFFLAGS := $(DEFAULT_TROFFFLAGS) $(EXTRA_TROFFFLAGS) -TROFF := troff - - -TROFF_CHECKSTYLE_LVL := 3 -NROFF_LINE_LENGTH := $(shell $(EXPR) $(MANWIDTH) - 2) -NROFF_OUT_DEVICE := \ - $(shell $(LOCALE) charmap \ - | $(GREP) -i 'utf-*8' >/dev/null \ - && $(ECHO) utf8 \ - || $(ECHO) ascii \ - ) - -DEFAULT_NROFFFLAGS := \ - -T$(NROFF_OUT_DEVICE) \ - -rLL=$(NROFF_LINE_LENGTH)n \ - -rCHECKSTYLE=$(TROFF_CHECKSTYLE_LVL) \ - -ww -EXTRA_NROFFFLAGS := -NROFFFLAGS := $(DEFAULT_NROFFFLAGS) $(EXTRA_NROFFFLAGS) - - -DEFAULT_GROTTYFLAGS := -c -EXTRA_GROTTYFLAGS := -GROTTYFLAGS := $(DEFAULT_GROTTYFLAGS) $(EXTRA_GROTTYFLAGS) -GROTTY := grotty - - -DEFAULT_GROPSFLAGS := -EXTRA_GROPSFLAGS := -GROPSFLAGS := $(DEFAULT_GROPSFLAGS) $(EXTRA_GROPSFLAGS) -GROPS := grops - - -endif # include guard diff --git a/share/mk/configure/build-depends/groff-base/eqn.mk b/share/mk/configure/build-depends/groff-base/eqn.mk new file mode 100644 index 0000000..57e4e51 --- /dev/null +++ b/share/mk/configure/build-depends/groff-base/eqn.mk @@ -0,0 +1,15 @@ +# Copyright 2024, Alejandro Colomar <alx@kernel.org> +# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception + + +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_GROFF_BASE_EQN_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_GROFF_BASE_EQN_INCLUDED := 1 + + +DEFAULT_EQNFLAGS := +EXTRA_EQNFLAGS := +EQNFLAGS := $(DEFAULT_EQNFLAGS) $(EXTRA_EQNFLAGS) +EQN := eqn + + +endif # include guard diff --git a/share/mk/configure/build-depends/groff-base/grops.mk b/share/mk/configure/build-depends/groff-base/grops.mk new file mode 100644 index 0000000..b85daed --- /dev/null +++ b/share/mk/configure/build-depends/groff-base/grops.mk @@ -0,0 +1,15 @@ +# Copyright 2024, Alejandro Colomar <alx@kernel.org> +# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception + + +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_GROFF_BASE_GROPS_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_GROFF_BASE_GROPS_INCLUDED := 1 + + +DEFAULT_GROPSFLAGS := +EXTRA_GROPSFLAGS := +GROPSFLAGS := $(DEFAULT_GROPSFLAGS) $(EXTRA_GROPSFLAGS) +GROPS := grops + + +endif # include guard diff --git a/share/mk/configure/build-depends/groff-base/grotty.mk b/share/mk/configure/build-depends/groff-base/grotty.mk new file mode 100644 index 0000000..9fb0895 --- /dev/null +++ b/share/mk/configure/build-depends/groff-base/grotty.mk @@ -0,0 +1,15 @@ +# Copyright 2024, Alejandro Colomar <alx@kernel.org> +# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception + + +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_GROFF_BASE_GROTTY_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_GROFF_BASE_GROTTY_INCLUDED := 1 + + +DEFAULT_GROTTYFLAGS := -c +EXTRA_GROTTYFLAGS := +GROTTYFLAGS := $(DEFAULT_GROTTYFLAGS) $(EXTRA_GROTTYFLAGS) +GROTTY := grotty + + +endif # include guard diff --git a/share/mk/configure/build-depends/groff-base/nroff.mk b/share/mk/configure/build-depends/groff-base/nroff.mk new file mode 100644 index 0000000..b131e15 --- /dev/null +++ b/share/mk/configure/build-depends/groff-base/nroff.mk @@ -0,0 +1,35 @@ +# Copyright 2024, Alejandro Colomar <alx@kernel.org> +# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception + + +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_GROFF_BASE_NROFF_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_GROFF_BASE_NROFF_INCLUDED := 1 + + +include $(MAKEFILEDIR)/configure/build-depends/coreutils/echo.mk +include $(MAKEFILEDIR)/configure/build-depends/coreutils/expr.mk +include $(MAKEFILEDIR)/configure/build-depends/grep/grep.mk +include $(MAKEFILEDIR)/configure/build-depends/libc-bin/locale.mk +include $(MAKEFILEDIR)/configure/build-depends/man/man.mk + + +NROFF_CHECKSTYLE_LVL := 3 +NROFF_LINE_LENGTH := $(shell $(EXPR) $(MANWIDTH) - 2) +NROFF_OUT_DEVICE := \ + $(shell $(LOCALE) charmap \ + | $(GREP) -i 'utf-*8' >/dev/null \ + && $(ECHO) utf8 \ + || $(ECHO) ascii \ + ) + + +DEFAULT_NROFFFLAGS := \ + -T$(NROFF_OUT_DEVICE) \ + -rLL=$(NROFF_LINE_LENGTH)n \ + -rCHECKSTYLE=$(NROFF_CHECKSTYLE_LVL) \ + -ww +EXTRA_NROFFFLAGS := +NROFFFLAGS := $(DEFAULT_NROFFFLAGS) $(EXTRA_NROFFFLAGS) + + +endif # include guard diff --git a/share/mk/configure/build-depends/groff-base/pic.mk b/share/mk/configure/build-depends/groff-base/pic.mk new file mode 100644 index 0000000..72e8d34 --- /dev/null +++ b/share/mk/configure/build-depends/groff-base/pic.mk @@ -0,0 +1,15 @@ +# Copyright 2024, Alejandro Colomar <alx@kernel.org> +# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception + + +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_GROFF_BASE_PIC_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_GROFF_BASE_PIC_INCLUDED := 1 + + +DEFAULT_PICFLAGS := +EXTRA_PICFLAGS := +PICFLAGS := $(DEFAULT_PICFLAGS) $(EXTRA_PICFLAGS) +PIC := pic + + +endif # include guard diff --git a/share/mk/configure/build-depends/groff-base/preconv.mk b/share/mk/configure/build-depends/groff-base/preconv.mk new file mode 100644 index 0000000..8cd7808 --- /dev/null +++ b/share/mk/configure/build-depends/groff-base/preconv.mk @@ -0,0 +1,15 @@ +# Copyright 2024, Alejandro Colomar <alx@kernel.org> +# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception + + +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_GROFF_BASE_PRECONV_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_GROFF_BASE_PRECONV_INCLUDED := 1 + + +DEFAULT_PRECONVFLAGS := +EXTRA_PRECONVFLAGS := +PRECONVFLAGS := $(DEFAULT_PRECONVFLAGS) $(EXTRA_PRECONVFLAGS) +PRECONV := preconv + + +endif # include guard diff --git a/share/mk/configure/build-depends/groff-base/tbl.mk b/share/mk/configure/build-depends/groff-base/tbl.mk new file mode 100644 index 0000000..ff87a62 --- /dev/null +++ b/share/mk/configure/build-depends/groff-base/tbl.mk @@ -0,0 +1,12 @@ +# Copyright 2024, Alejandro Colomar <alx@kernel.org> +# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception + + +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_GROFF_BASE_TBL_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_GROFF_BASE_TBL_INCLUDED := 1 + + +TBL := tbl + + +endif # include guard diff --git a/share/mk/configure/build-depends/groff-base/troff.mk b/share/mk/configure/build-depends/groff-base/troff.mk new file mode 100644 index 0000000..b9b7518 --- /dev/null +++ b/share/mk/configure/build-depends/groff-base/troff.mk @@ -0,0 +1,17 @@ +# Copyright 2024, Alejandro Colomar <alx@kernel.org> +# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception + + +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_GROFF_BASE_TROFF_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_GROFF_BASE_TROFF_INCLUDED := 1 + + +DEFAULT_TROFFFLAGS := \ + -wbreak \ + -rS12 +EXTRA_TROFFFLAGS := +TROFFFLAGS := $(DEFAULT_TROFFFLAGS) $(EXTRA_TROFFFLAGS) +TROFF := troff + + +endif # include guard diff --git a/share/mk/configure/build-depends/groff/afmtodit.mk b/share/mk/configure/build-depends/groff/afmtodit.mk new file mode 100644 index 0000000..7ffa7a0 --- /dev/null +++ b/share/mk/configure/build-depends/groff/afmtodit.mk @@ -0,0 +1,19 @@ +# Copyright 2024, Alejandro Colomar <alx@kernel.org> +# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception + + +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_GROFF_AFMTODIT_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_GROFF_AFMTODIT_INCLUDED := 1 + + +PDF_TEXT_ENC := /usr/share/groff/current/font/devpdf/enc/text.enc +PDF_TEXT_MAP := /usr/share/groff/current/font/devpdf/map/text.map + + +DEFAULT_AFMTODITFLAGS := +EXTRA_AFMTODITFLAGS := +AFMTODITFLAGS := $(DEFAULT_AFMTODITFLAGS) $(EXTRA_AFMTODITFLAGS) +AFMTODIT := afmtodit + + +endif # include guard diff --git a/share/mk/configure/build-depends/groff/gropdf.mk b/share/mk/configure/build-depends/groff/gropdf.mk new file mode 100644 index 0000000..c8edad6 --- /dev/null +++ b/share/mk/configure/build-depends/groff/gropdf.mk @@ -0,0 +1,15 @@ +# Copyright 2024, Alejandro Colomar <alx@kernel.org> +# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception + + +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_GROFF_GROPDF_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_GROFF_GROPDF_INCLUDED := 1 + + +DEFAULT_GROPDFFLAGS := +EXTRA_GROPDFFLAGS := +GROPDFFLAGS := $(DEFAULT_GROPDFFLAGS) $(EXTRA_GROPDFFLAGS) +GROPDF := gropdf + + +endif # include guard diff --git a/share/mk/configure/build-depends/groff/pfbtops.mk b/share/mk/configure/build-depends/groff/pfbtops.mk new file mode 100644 index 0000000..73f5f04 --- /dev/null +++ b/share/mk/configure/build-depends/groff/pfbtops.mk @@ -0,0 +1,15 @@ +# Copyright 2024, Alejandro Colomar <alx@kernel.org> +# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception + + +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_GROFF_PFBTOPS_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_GROFF_PFBTOPS_INCLUDED := 1 + + +DEFAULT_PFBTOPSFLAGS := +EXTRA_PFBTOPSFLAGS := +PFBTOPSFLAGS := $(DEFAULT_PFBTOPSFLAGS) $(EXTRA_PFBTOPSFLAGS) +PFBTOPS := pfbtops + + +endif # include guard diff --git a/share/mk/configure/build-depends/groff.mk b/share/mk/configure/build-depends/groff/post-grohtml.mk index ea0c7a3..700c0e2 100644 --- a/share/mk/configure/build-depends/groff.mk +++ b/share/mk/configure/build-depends/groff/post-grohtml.mk @@ -2,14 +2,8 @@ # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception -ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_GROFF_INCLUDED -MAKEFILE_CONFIGURE_BUILD_DEPENDS_GROFF_INCLUDED := 1 - - -DEFAULT_GROPDFFLAGS := -EXTRA_GROPDFFLAGS := -GROPDFFLAGS := $(DEFAULT_GROPDFFLAGS) $(EXTRA_GROPDFFLAGS) -GROPDF := gropdf +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_GROFF_POST_GROHTML_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_GROFF_POST_GROHTML_INCLUDED := 1 DEFAULT_POST_GROHTMLFLAGS := diff --git a/share/mk/configure/build-depends/gzip.mk b/share/mk/configure/build-depends/gzip/gzip.mk index 6633654..0e37483 100644 --- a/share/mk/configure/build-depends/gzip.mk +++ b/share/mk/configure/build-depends/gzip/gzip.mk @@ -2,8 +2,8 @@ # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception -ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_GZIP_INCLUDED -MAKEFILE_CONFIGURE_BUILD_DEPENDS_GZIP_INCLUDED := 1 +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_GZIP_GZIP_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_GZIP_GZIP_INCLUDED := 1 DEFAULT_GZIPFLAGS := -n diff --git a/share/mk/configure/build-depends/iwyu.mk b/share/mk/configure/build-depends/iwyu/iwyu.mk index bd5cf7f..4c0d707 100644 --- a/share/mk/configure/build-depends/iwyu.mk +++ b/share/mk/configure/build-depends/iwyu/iwyu.mk @@ -2,8 +2,8 @@ # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception -ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_IWYU_INCLUDED -MAKEFILE_CONFIGURE_BUILD_DEPENDS_IWYU_INCLUDED := 1 +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_IWYU_IWYU_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_IWYU_IWYU_INCLUDED := 1 DEFAULT_IWYUFLAGS := \ diff --git a/share/mk/configure/build-depends/libc-bin.mk b/share/mk/configure/build-depends/libc-bin/locale.mk index 281502b..fe670f4 100644 --- a/share/mk/configure/build-depends/libc-bin.mk +++ b/share/mk/configure/build-depends/libc-bin/locale.mk @@ -2,8 +2,8 @@ # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception -ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_LIBC_BIN_INCLUDED -MAKEFILE_CONFIGURE_BUILD_DEPENDS_LIBC_BIN_INCLUDED := 1 +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_LIBC_BIN_LOCALE_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_LIBC_BIN_LOCALE_INCLUDED := 1 LOCALE := locale diff --git a/share/mk/configure/build-depends/lzip.mk b/share/mk/configure/build-depends/lzip/lzip.mk index e18868f..e2a0d82 100644 --- a/share/mk/configure/build-depends/lzip.mk +++ b/share/mk/configure/build-depends/lzip/lzip.mk @@ -2,8 +2,8 @@ # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception -ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_LZIP_INCLUDED -MAKEFILE_CONFIGURE_BUILD_DEPENDS_LZIP_INCLUDED := 1 +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_LZIP_LZIP_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_LZIP_LZIP_INCLUDED := 1 DEFAULT_LZIPFLAGS := diff --git a/share/mk/configure/build-depends/man.mk b/share/mk/configure/build-depends/man/man.mk index 5248d42..22ce6c0 100644 --- a/share/mk/configure/build-depends/man.mk +++ b/share/mk/configure/build-depends/man/man.mk @@ -2,8 +2,8 @@ # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception -ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_MAN_INCLUDED -MAKEFILE_CONFIGURE_BUILD_DEPENDS_MAN_INCLUDED := 1 +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_MAN_MAN_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_MAN_MAN_INCLUDED := 1 MANWIDTH ?= 80 diff --git a/share/mk/configure/build-depends/mandoc.mk b/share/mk/configure/build-depends/mandoc/mandoc.mk index 87eccd6..80c5b04 100644 --- a/share/mk/configure/build-depends/mandoc.mk +++ b/share/mk/configure/build-depends/mandoc/mandoc.mk @@ -2,8 +2,8 @@ # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception -ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_MANDOC_INCLUDED -MAKEFILE_CONFIGURE_BUILD_DEPENDS_MANDOC_INCLUDED := 1 +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_MANDOC_MANDOC_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_MANDOC_MANDOC_INCLUDED := 1 DEFAULT_MANDOCFLAGS := -Tlint diff --git a/share/mk/configure/build-depends/moreutils.mk b/share/mk/configure/build-depends/moreutils/sponge.mk index 69b60fa..e9b8989 100644 --- a/share/mk/configure/build-depends/moreutils.mk +++ b/share/mk/configure/build-depends/moreutils/sponge.mk @@ -2,8 +2,8 @@ # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception -ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_MOREUTILS_INCLUDED -MAKEFILE_CONFIGURE_BUILD_DEPENDS_MOREUTILS_INCLUDED := 1 +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_MOREUTILS_SPONGE_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_MOREUTILS_SPONGE_INCLUDED := 1 SPONGE := sponge diff --git a/share/mk/configure/build-depends/pkgconf.mk b/share/mk/configure/build-depends/pkgconf/pkgconf.mk index b7b5c3f..f6bc885 100644 --- a/share/mk/configure/build-depends/pkgconf.mk +++ b/share/mk/configure/build-depends/pkgconf/pkgconf.mk @@ -2,12 +2,8 @@ # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception -ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_PKGCONF_INCLUDED -MAKEFILE_CONFIGURE_BUILD_DEPENDS_PKGCONF_INCLUDED := 1 - - -include $(MAKEFILEDIR)/src.mk -include $(MAKEFILEDIR)/configure/version.mk +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_PKGCONF_PKGCONF_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_PKGCONF_PKGCONF_INCLUDED := 1 # Compat diff --git a/share/mk/configure/build-depends/sed.mk b/share/mk/configure/build-depends/sed/sed.mk index 3d1fcd8..30dcf20 100644 --- a/share/mk/configure/build-depends/sed.mk +++ b/share/mk/configure/build-depends/sed/sed.mk @@ -2,8 +2,8 @@ # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception -ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_SED_INCLUDED -MAKEFILE_CONFIGURE_BUILD_DEPENDS_SED_INCLUDED := 1 +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_SED_SED_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_SED_SED_INCLUDED := 1 SED := sed diff --git a/share/mk/configure/build-depends/tar.mk b/share/mk/configure/build-depends/tar/tar.mk index 3ea5537..d9b87db 100644 --- a/share/mk/configure/build-depends/tar.mk +++ b/share/mk/configure/build-depends/tar/tar.mk @@ -2,8 +2,8 @@ # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception -ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_TAR_INCLUDED -MAKEFILE_CONFIGURE_BUILD_DEPENDS_TAR_INCLUDED := 1 +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_TAR_TAR_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_TAR_TAR_INCLUDED := 1 include $(MAKEFILEDIR)/configure/version.mk diff --git a/share/mk/configure/build-depends/texlive-fonts-extra-links/Tinos-Regular.ttf.mk b/share/mk/configure/build-depends/texlive-fonts-extra-links/Tinos-Regular.ttf.mk new file mode 100644 index 0000000..1005f6b --- /dev/null +++ b/share/mk/configure/build-depends/texlive-fonts-extra-links/Tinos-Regular.ttf.mk @@ -0,0 +1,12 @@ +# Copyright 2024, Alejandro Colomar <alx@kernel.org> +# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception + + +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_TEXLIVE_FONTS_EXTRA_LINKS_TINOS_REGULAR_TTF_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_TEXLIVE_FONTS_EXTRA_LINKS_TINOS_REGULAR_TTF_INCLUDED := 1 + + +TINOSR_TTF := /usr/share/texlive/texmf-dist/fonts/truetype/google/tinos/Tinos-Regular.ttf + + +endif # include guard diff --git a/share/mk/configure/build-depends/texlive-fonts-extra/Tinos.pfb.mk b/share/mk/configure/build-depends/texlive-fonts-extra/Tinos.pfb.mk new file mode 100644 index 0000000..c1c713c --- /dev/null +++ b/share/mk/configure/build-depends/texlive-fonts-extra/Tinos.pfb.mk @@ -0,0 +1,12 @@ +# Copyright 2024, Alejandro Colomar <alx@kernel.org> +# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception + + +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_TEXLIVE_FONTS_EXTRA_TINOS_PFB_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_TEXLIVE_FONTS_EXTRA_TINOS_PFB_INCLUDED := 1 + + +TINOS_PFB := /usr/share/texlive/texmf-dist/fonts/type1/google/tinos/Tinos.pfb + + +endif # include guard diff --git a/share/mk/configure/build-depends/xz-utils.mk b/share/mk/configure/build-depends/xz-utils/xz.mk index d00a3b7..c3c772b 100644 --- a/share/mk/configure/build-depends/xz-utils.mk +++ b/share/mk/configure/build-depends/xz-utils/xz.mk @@ -2,8 +2,8 @@ # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception -ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_XZ_UTILS_INCLUDED -MAKEFILE_CONFIGURE_BUILD_DEPENDS_XZ_UTILS_INCLUDED := 1 +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_XZ_UTILS_XZ_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_XZ_UTILS_XZ_INCLUDED := 1 DEFAULT_XZFLAGS := diff --git a/share/mk/configure/directory_variables/build.mk b/share/mk/configure/directory_variables/build.mk new file mode 100644 index 0000000..e31da03 --- /dev/null +++ b/share/mk/configure/directory_variables/build.mk @@ -0,0 +1,12 @@ +# Copyright 2021-2024, Alejandro Colomar <alx@kernel.org> +# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception + + +ifndef MAKEFILE_CONFIGURE_DIRECTORY_VARIABLES_BUILD_INCLUDED +MAKEFILE_CONFIGURE_DIRECTORY_VARIABLES_BUILD_INCLUDED := 1 + + +builddir := .tmp + + +endif # include guard diff --git a/share/mk/configure/directory_variables.mk b/share/mk/configure/directory_variables/install.mk index e4ee616..cd5fda6 100644 --- a/share/mk/configure/directory_variables.mk +++ b/share/mk/configure/directory_variables/install.mk @@ -2,22 +2,20 @@ # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception -ifndef MAKEFILE_CONFIGURE_DIRECTORY_VARIABLES_INCLUDED -MAKEFILE_CONFIGURE_DIRECTORY_VARIABLES_INCLUDED := 1 +ifndef MAKEFILE_CONFIGURE_DIRECTORY_VARIABLES_INSTALL_INCLUDED +MAKEFILE_CONFIGURE_DIRECTORY_VARIABLES_INSTALL_INCLUDED := 1 -include $(MAKEFILEDIR)/src.mk - - -builddir := .tmp +include $(MAKEFILEDIR)/configure/directory_variables/src.mk DESTDIR := prefix := /usr/local datarootdir := $(prefix)/share +mandir := $(datarootdir)/man docdir := $(datarootdir)/doc htmldir := $(docdir)/html/man -mandir := $(datarootdir)/man +pdfdir := $(docdir)/pdf $(foreach s, $(MANSECTIONS), \ diff --git a/share/mk/configure/directory_variables/src.mk b/share/mk/configure/directory_variables/src.mk new file mode 100644 index 0000000..d86cbf1 --- /dev/null +++ b/share/mk/configure/directory_variables/src.mk @@ -0,0 +1,20 @@ +# Copyright 2021-2024, Alejandro Colomar <alx@kernel.org> +# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception + + +ifndef MAKEFILE_CONFIGURE_DIRECTORY_VARIABLES_SRC_INCLUDED +MAKEFILE_CONFIGURE_DIRECTORY_VARIABLES_SRC_INCLUDED := 1 + + +SYSCONFDIR := $(srcdir)/etc +MANDIR := $(srcdir)/man + + +MANSECTIONS := $(patsubst $(MANDIR)/man%/, %, $(wildcard $(MANDIR)/man*/)) + + +$(foreach s, $(MANSECTIONS), \ + $(eval MAN$(s)DIR := $(MANDIR)/man$(s))) + + +endif # include guard diff --git a/share/mk/configure/link_pages.mk b/share/mk/configure/man/link_pages.mk index 52136ef..8e9c56c 100644 --- a/share/mk/configure/link_pages.mk +++ b/share/mk/configure/man/link_pages.mk @@ -2,8 +2,8 @@ # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception -ifndef MAKEFILE_CONFIGURE_LINK_PAGES_INCLUDED -MAKEFILE_CONFIGURE_LINK_PAGES_INCLUDED := 1 +ifndef MAKEFILE_CONFIGURE_MAN_LINK_PAGES_INCLUDED +MAKEFILE_CONFIGURE_MAN_LINK_PAGES_INCLUDED := 1 LINK_PAGES := .so diff --git a/share/mk/configure/src.mk b/share/mk/configure/src.mk deleted file mode 100644 index 2a24f4e..0000000 --- a/share/mk/configure/src.mk +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 2021-2024, Alejandro Colomar <alx@kernel.org> -# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception - - -ifndef MAKEFILE_CONFIGURE_SRC_INCLUDED -MAKEFILE_CONFIGURE_SRC_INCLUDED := 1 - - -SYSCONFDIR := $(srcdir)/etc -MANDIR := $(srcdir) - - -MANSECTIONS := $(patsubst $(MANDIR)/man%/, %, $(wildcard $(MANDIR)/man*/)) - - -endif # include guard diff --git a/share/mk/configure/version.mk b/share/mk/configure/version.mk index cc89bae..24720ca 100644 --- a/share/mk/configure/version.mk +++ b/share/mk/configure/version.mk @@ -6,15 +6,25 @@ ifndef MAKEFILE_CONFIGURE_VERSION_INCLUDED MAKEFILE_CONFIGURE_VERSION_INCLUDED := 1 -include $(MAKEFILEDIR)/configure/build-depends/coreutils.mk -include $(MAKEFILEDIR)/configure/build-depends/findutils.mk -include $(MAKEFILEDIR)/configure/build-depends/git.mk -include $(MAKEFILEDIR)/configure/build-depends/grep.mk +include $(MAKEFILEDIR)/configure/build-depends/coreutils/echo.mk +include $(MAKEFILEDIR)/configure/build-depends/coreutils/sort.mk +include $(MAKEFILEDIR)/configure/build-depends/coreutils/stat.mk +include $(MAKEFILEDIR)/configure/build-depends/coreutils/tail.mk +include $(MAKEFILEDIR)/configure/build-depends/findutils/find.mk +include $(MAKEFILEDIR)/configure/build-depends/findutils/xargs.mk +include $(MAKEFILEDIR)/configure/build-depends/git/git.mk +include $(MAKEFILEDIR)/configure/build-depends/grep/grep.mk +include $(MAKEFILEDIR)/configure/build-depends/sed/sed.mk include $(MAKEFILEDIR)/configure/verbose.mk -DISTNAME := man-pages-6.7 -DISTVERSION := 6.7 +projname := man-pages +VERSION := 6.8 +EXTRAVERSION := + + +DISTVERSION := $(VERSION)$(EXTRAVERSION) +DISTNAME := $(projname)-$(DISTVERSION) DISTFILESCMD := \ @@ -37,7 +47,10 @@ DISTDATECMD := \ fi; -DISTDATE := Tue, 19 Mar 2024 19:07:13 +0100 +DISTDATE := Sun, 19 May 2024 13:55:47 +0200 + + +MANPAGEDATECMD = $(GIT) log --format=%cs -1 -- $< $(HIDE_ERR) endif # include guard diff --git a/share/mk/configure/z.mk b/share/mk/configure/z.mk deleted file mode 100644 index 2eec437..0000000 --- a/share/mk/configure/z.mk +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 2023-2024, Alejandro Colomar <alx@kernel.org> -# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception - - -ifndef MAKEFILE_CONFIGURE_Z_INCLUDED -MAKEFILE_CONFIGURE_Z_INCLUDED := 1 - - -Z := -ifeq ($(Z),) -else ifeq ($(Z),.bz2) -else ifeq ($(Z),.gz) -else ifeq ($(Z),.lz) -else ifeq ($(Z),.xz) -else -$(warning "Z": "$(Z)") -$(error Valid values for "Z": ["", ".bz2", ".gz", ".lz", ".xz"]) -endif - - -endif # include guard |