From 3d08cd331c1adcf0d917392f7e527b3f00511748 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 24 May 2024 06:52:22 +0200 Subject: Merging upstream version 6.8. Signed-off-by: Daniel Baumann --- share/mk/configure/build-depends/binutils/ld.mk | 51 +++++++++++++++ share/mk/configure/build-depends/bsdextrautils.mk | 18 ------ .../configure/build-depends/bsdextrautils/col.mk | 18 ++++++ share/mk/configure/build-depends/bzip2.mk | 15 ----- share/mk/configure/build-depends/bzip2/bzip2.mk | 15 +++++ share/mk/configure/build-depends/cc.mk | 63 ------------------- share/mk/configure/build-depends/checkpatch.mk | 19 ------ .../build-depends/checkpatch/checkpatch.mk | 19 ++++++ share/mk/configure/build-depends/clang-tidy.mk | 22 ------- .../build-depends/clang-tidy/clang-tidy.mk | 22 +++++++ share/mk/configure/build-depends/clang.mk | 19 ------ share/mk/configure/build-depends/clang/clang.mk | 19 ++++++ share/mk/configure/build-depends/coreutils.mk | 32 ---------- share/mk/configure/build-depends/coreutils/cat.mk | 12 ++++ share/mk/configure/build-depends/coreutils/cp.mk | 12 ++++ share/mk/configure/build-depends/coreutils/echo.mk | 12 ++++ share/mk/configure/build-depends/coreutils/expr.mk | 12 ++++ share/mk/configure/build-depends/coreutils/head.mk | 12 ++++ .../configure/build-depends/coreutils/install.mk | 16 +++++ share/mk/configure/build-depends/coreutils/ln.mk | 12 ++++ .../mk/configure/build-depends/coreutils/mkdir.mk | 12 ++++ .../configure/build-depends/coreutils/realpath.mk | 12 ++++ share/mk/configure/build-depends/coreutils/rm.mk | 12 ++++ share/mk/configure/build-depends/coreutils/sort.mk | 12 ++++ share/mk/configure/build-depends/coreutils/stat.mk | 12 ++++ share/mk/configure/build-depends/coreutils/tac.mk | 12 ++++ share/mk/configure/build-depends/coreutils/tail.mk | 12 ++++ share/mk/configure/build-depends/coreutils/test.mk | 12 ++++ .../mk/configure/build-depends/coreutils/touch.mk | 12 ++++ share/mk/configure/build-depends/coreutils/true.mk | 12 ++++ share/mk/configure/build-depends/cpp.mk | 20 ------ share/mk/configure/build-depends/cpp/cpp.mk | 20 ++++++ share/mk/configure/build-depends/cppcheck.mk | 24 -------- .../configure/build-depends/cppcheck/cppcheck.mk | 25 ++++++++ share/mk/configure/build-depends/cpplint.mk | 19 ------ .../mk/configure/build-depends/cpplint/cpplint.mk | 19 ++++++ share/mk/configure/build-depends/diffoscope.mk | 12 ---- .../build-depends/diffoscope/diffoscope.mk | 12 ++++ share/mk/configure/build-depends/findutils.mk | 13 ---- share/mk/configure/build-depends/findutils/find.mk | 12 ++++ .../mk/configure/build-depends/findutils/xargs.mk | 12 ++++ .../configure/build-depends/fontforge/fontforge.mk | 15 +++++ share/mk/configure/build-depends/gcc/cc.mk | 65 +++++++++++++++++++ share/mk/configure/build-depends/git.mk | 12 ---- share/mk/configure/build-depends/git/git.mk | 12 ++++ share/mk/configure/build-depends/grep.mk | 12 ---- share/mk/configure/build-depends/grep/grep.mk | 12 ++++ share/mk/configure/build-depends/groff-base.mk | 72 ---------------------- share/mk/configure/build-depends/groff-base/eqn.mk | 15 +++++ .../mk/configure/build-depends/groff-base/grops.mk | 15 +++++ .../configure/build-depends/groff-base/grotty.mk | 15 +++++ .../mk/configure/build-depends/groff-base/nroff.mk | 35 +++++++++++ share/mk/configure/build-depends/groff-base/pic.mk | 15 +++++ .../configure/build-depends/groff-base/preconv.mk | 15 +++++ share/mk/configure/build-depends/groff-base/tbl.mk | 12 ++++ .../mk/configure/build-depends/groff-base/troff.mk | 17 +++++ share/mk/configure/build-depends/groff.mk | 21 ------- share/mk/configure/build-depends/groff/afmtodit.mk | 19 ++++++ share/mk/configure/build-depends/groff/gropdf.mk | 15 +++++ share/mk/configure/build-depends/groff/pfbtops.mk | 15 +++++ .../configure/build-depends/groff/post-grohtml.mk | 15 +++++ share/mk/configure/build-depends/gzip.mk | 15 ----- share/mk/configure/build-depends/gzip/gzip.mk | 15 +++++ share/mk/configure/build-depends/iwyu.mk | 17 ----- share/mk/configure/build-depends/iwyu/iwyu.mk | 17 +++++ share/mk/configure/build-depends/ld.mk | 50 --------------- share/mk/configure/build-depends/libc-bin.mk | 12 ---- .../mk/configure/build-depends/libc-bin/locale.mk | 12 ++++ share/mk/configure/build-depends/lzip.mk | 15 ----- share/mk/configure/build-depends/lzip/lzip.mk | 15 +++++ share/mk/configure/build-depends/man.mk | 12 ---- share/mk/configure/build-depends/man/man.mk | 12 ++++ share/mk/configure/build-depends/mandoc.mk | 15 ----- share/mk/configure/build-depends/mandoc/mandoc.mk | 15 +++++ share/mk/configure/build-depends/moreutils.mk | 12 ---- .../mk/configure/build-depends/moreutils/sponge.mk | 12 ++++ share/mk/configure/build-depends/pkgconf.mk | 27 -------- .../mk/configure/build-depends/pkgconf/pkgconf.mk | 23 +++++++ share/mk/configure/build-depends/sed.mk | 12 ---- share/mk/configure/build-depends/sed/sed.mk | 12 ++++ share/mk/configure/build-depends/tar.mk | 22 ------- share/mk/configure/build-depends/tar/tar.mk | 22 +++++++ .../texlive-fonts-extra-links/Tinos-Regular.ttf.mk | 12 ++++ .../build-depends/texlive-fonts-extra/Tinos.pfb.mk | 12 ++++ share/mk/configure/build-depends/xz-utils.mk | 15 ----- share/mk/configure/build-depends/xz-utils/xz.mk | 15 +++++ share/mk/configure/directory_variables.mk | 29 --------- share/mk/configure/directory_variables/build.mk | 12 ++++ share/mk/configure/directory_variables/install.mk | 27 ++++++++ share/mk/configure/directory_variables/src.mk | 20 ++++++ share/mk/configure/link_pages.mk | 18 ------ share/mk/configure/man/link_pages.mk | 18 ++++++ share/mk/configure/src.mk | 16 ----- share/mk/configure/version.mk | 27 +++++--- share/mk/configure/z.mk | 21 ------- 95 files changed, 1050 insertions(+), 708 deletions(-) create mode 100644 share/mk/configure/build-depends/binutils/ld.mk delete mode 100644 share/mk/configure/build-depends/bsdextrautils.mk create mode 100644 share/mk/configure/build-depends/bsdextrautils/col.mk delete mode 100644 share/mk/configure/build-depends/bzip2.mk create mode 100644 share/mk/configure/build-depends/bzip2/bzip2.mk delete mode 100644 share/mk/configure/build-depends/cc.mk delete mode 100644 share/mk/configure/build-depends/checkpatch.mk create mode 100644 share/mk/configure/build-depends/checkpatch/checkpatch.mk delete mode 100644 share/mk/configure/build-depends/clang-tidy.mk create mode 100644 share/mk/configure/build-depends/clang-tidy/clang-tidy.mk delete mode 100644 share/mk/configure/build-depends/clang.mk create mode 100644 share/mk/configure/build-depends/clang/clang.mk delete mode 100644 share/mk/configure/build-depends/coreutils.mk create mode 100644 share/mk/configure/build-depends/coreutils/cat.mk create mode 100644 share/mk/configure/build-depends/coreutils/cp.mk create mode 100644 share/mk/configure/build-depends/coreutils/echo.mk create mode 100644 share/mk/configure/build-depends/coreutils/expr.mk create mode 100644 share/mk/configure/build-depends/coreutils/head.mk create mode 100644 share/mk/configure/build-depends/coreutils/install.mk create mode 100644 share/mk/configure/build-depends/coreutils/ln.mk create mode 100644 share/mk/configure/build-depends/coreutils/mkdir.mk create mode 100644 share/mk/configure/build-depends/coreutils/realpath.mk create mode 100644 share/mk/configure/build-depends/coreutils/rm.mk create mode 100644 share/mk/configure/build-depends/coreutils/sort.mk create mode 100644 share/mk/configure/build-depends/coreutils/stat.mk create mode 100644 share/mk/configure/build-depends/coreutils/tac.mk create mode 100644 share/mk/configure/build-depends/coreutils/tail.mk create mode 100644 share/mk/configure/build-depends/coreutils/test.mk create mode 100644 share/mk/configure/build-depends/coreutils/touch.mk create mode 100644 share/mk/configure/build-depends/coreutils/true.mk delete mode 100644 share/mk/configure/build-depends/cpp.mk create mode 100644 share/mk/configure/build-depends/cpp/cpp.mk delete mode 100644 share/mk/configure/build-depends/cppcheck.mk create mode 100644 share/mk/configure/build-depends/cppcheck/cppcheck.mk delete mode 100644 share/mk/configure/build-depends/cpplint.mk create mode 100644 share/mk/configure/build-depends/cpplint/cpplint.mk delete mode 100644 share/mk/configure/build-depends/diffoscope.mk create mode 100644 share/mk/configure/build-depends/diffoscope/diffoscope.mk delete mode 100644 share/mk/configure/build-depends/findutils.mk create mode 100644 share/mk/configure/build-depends/findutils/find.mk create mode 100644 share/mk/configure/build-depends/findutils/xargs.mk create mode 100644 share/mk/configure/build-depends/fontforge/fontforge.mk create mode 100644 share/mk/configure/build-depends/gcc/cc.mk delete mode 100644 share/mk/configure/build-depends/git.mk create mode 100644 share/mk/configure/build-depends/git/git.mk delete mode 100644 share/mk/configure/build-depends/grep.mk create mode 100644 share/mk/configure/build-depends/grep/grep.mk delete mode 100644 share/mk/configure/build-depends/groff-base.mk create mode 100644 share/mk/configure/build-depends/groff-base/eqn.mk create mode 100644 share/mk/configure/build-depends/groff-base/grops.mk create mode 100644 share/mk/configure/build-depends/groff-base/grotty.mk create mode 100644 share/mk/configure/build-depends/groff-base/nroff.mk create mode 100644 share/mk/configure/build-depends/groff-base/pic.mk create mode 100644 share/mk/configure/build-depends/groff-base/preconv.mk create mode 100644 share/mk/configure/build-depends/groff-base/tbl.mk create mode 100644 share/mk/configure/build-depends/groff-base/troff.mk delete mode 100644 share/mk/configure/build-depends/groff.mk create mode 100644 share/mk/configure/build-depends/groff/afmtodit.mk create mode 100644 share/mk/configure/build-depends/groff/gropdf.mk create mode 100644 share/mk/configure/build-depends/groff/pfbtops.mk create mode 100644 share/mk/configure/build-depends/groff/post-grohtml.mk delete mode 100644 share/mk/configure/build-depends/gzip.mk create mode 100644 share/mk/configure/build-depends/gzip/gzip.mk delete mode 100644 share/mk/configure/build-depends/iwyu.mk create mode 100644 share/mk/configure/build-depends/iwyu/iwyu.mk delete mode 100644 share/mk/configure/build-depends/ld.mk delete mode 100644 share/mk/configure/build-depends/libc-bin.mk create mode 100644 share/mk/configure/build-depends/libc-bin/locale.mk delete mode 100644 share/mk/configure/build-depends/lzip.mk create mode 100644 share/mk/configure/build-depends/lzip/lzip.mk delete mode 100644 share/mk/configure/build-depends/man.mk create mode 100644 share/mk/configure/build-depends/man/man.mk delete mode 100644 share/mk/configure/build-depends/mandoc.mk create mode 100644 share/mk/configure/build-depends/mandoc/mandoc.mk delete mode 100644 share/mk/configure/build-depends/moreutils.mk create mode 100644 share/mk/configure/build-depends/moreutils/sponge.mk delete mode 100644 share/mk/configure/build-depends/pkgconf.mk create mode 100644 share/mk/configure/build-depends/pkgconf/pkgconf.mk delete mode 100644 share/mk/configure/build-depends/sed.mk create mode 100644 share/mk/configure/build-depends/sed/sed.mk delete mode 100644 share/mk/configure/build-depends/tar.mk create mode 100644 share/mk/configure/build-depends/tar/tar.mk create mode 100644 share/mk/configure/build-depends/texlive-fonts-extra-links/Tinos-Regular.ttf.mk create mode 100644 share/mk/configure/build-depends/texlive-fonts-extra/Tinos.pfb.mk delete mode 100644 share/mk/configure/build-depends/xz-utils.mk create mode 100644 share/mk/configure/build-depends/xz-utils/xz.mk delete mode 100644 share/mk/configure/directory_variables.mk create mode 100644 share/mk/configure/directory_variables/build.mk create mode 100644 share/mk/configure/directory_variables/install.mk create mode 100644 share/mk/configure/directory_variables/src.mk delete mode 100644 share/mk/configure/link_pages.mk create mode 100644 share/mk/configure/man/link_pages.mk delete mode 100644 share/mk/configure/src.mk delete mode 100644 share/mk/configure/z.mk (limited to 'share/mk/configure') diff --git a/share/mk/configure/build-depends/binutils/ld.mk b/share/mk/configure/build-depends/binutils/ld.mk new file mode 100644 index 0000000..687039f --- /dev/null +++ b/share/mk/configure/build-depends/binutils/ld.mk @@ -0,0 +1,51 @@ +# Copyright 2022-2024, Alejandro Colomar +# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception + + +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_BINUTILS_LD_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_BINUTILS_LD_INCLUDED := 1 + + +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) $(CPPFLAGS) $(CFLAGS) + + +LD_HAS_FUSE_LINKER_PLUGIN := \ + $(shell \ + $(ECHO) 'int main(void) {}' \ + | $(LD) -fuse-linker-plugin -x c -o /dev/null /dev/stdin $(HIDE_ERR) \ + && $(ECHO) yes \ + || $(ECHO) no; \ + ) + + +DEFAULT_LDFLAGS := \ + -Wl,--as-needed \ + -Wl,--no-allow-shlib-undefined \ + -Wl,--no-copy-dt-needed-entries \ + -Wl,--no-undefined \ + $(shell $(PKGCONF_CMD) --libs-only-L $(PKGCONF_LIBS) $(HIDE_ERR)) \ + $(shell $(PKGCONF_CMD) --libs-only-other $(PKGCONF_LIBS) $(HIDE_ERR)) + +ifeq ($(LD_HAS_FUSE_LINKER_PLUGIN),yes) +DEFAULT_LDFLAGS += -fuse-linker-plugin +endif + +EXTRA_LDFLAGS := +LDFLAGS := $(DEFAULT_LDFLAGS) $(EXTRA_LDFLAGS) + + +DEFAULT_LDLIBS := \ + -lc \ + $(shell $(PKGCONF_CMD) --libs-only-l $(PKGCONF_LIBS) $(HIDE_ERR)) +EXTRA_LDLIBS := +LDLIBS := $(DEFAULT_LDLIBS) $(EXTRA_LDLIBS) + + +endif # include guard diff --git a/share/mk/configure/build-depends/bsdextrautils.mk b/share/mk/configure/build-depends/bsdextrautils.mk deleted file mode 100644 index 347e4bc..0000000 --- a/share/mk/configure/build-depends/bsdextrautils.mk +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 2024, Alejandro Colomar -# 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 - - -DEFAULT_COLFLAGS := \ - -b \ - -p \ - -x -EXTRA_COLFLAGS := -COLFLAGS := $(DEFAULT_COLFLAGS) $(EXTRA_COLFLAGS) -COL := col - - -endif # include guard diff --git a/share/mk/configure/build-depends/bsdextrautils/col.mk b/share/mk/configure/build-depends/bsdextrautils/col.mk new file mode 100644 index 0000000..d7aeca2 --- /dev/null +++ b/share/mk/configure/build-depends/bsdextrautils/col.mk @@ -0,0 +1,18 @@ +# Copyright 2024, Alejandro Colomar +# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception + + +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_BSDEXTRAUTILS_COL_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_BSDEXTRAUTILS_COL_INCLUDED := 1 + + +DEFAULT_COLFLAGS := \ + -b \ + -p \ + -x +EXTRA_COLFLAGS := +COLFLAGS := $(DEFAULT_COLFLAGS) $(EXTRA_COLFLAGS) +COL := col + + +endif # include guard diff --git a/share/mk/configure/build-depends/bzip2.mk b/share/mk/configure/build-depends/bzip2.mk deleted file mode 100644 index 71e6366..0000000 --- a/share/mk/configure/build-depends/bzip2.mk +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 2023-2024, Alejandro Colomar -# 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 - - -DEFAULT_BZIP2FLAGS := -EXTRA_BZIP2FLAGS := -BZIP2FLAGS := $(DEFAULT_BZIP2FLAGS) $(EXTRA_BZIP2FLAGS) -BZIP2 := bzip2 - - -endif # include guard diff --git a/share/mk/configure/build-depends/bzip2/bzip2.mk b/share/mk/configure/build-depends/bzip2/bzip2.mk new file mode 100644 index 0000000..ccc241a --- /dev/null +++ b/share/mk/configure/build-depends/bzip2/bzip2.mk @@ -0,0 +1,15 @@ +# Copyright 2023-2024, Alejandro Colomar +# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception + + +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_BZIP2_BZIP2_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_BZIP2_BZIP2_INCLUDED := 1 + + +DEFAULT_BZIP2FLAGS := +EXTRA_BZIP2FLAGS := +BZIP2FLAGS := $(DEFAULT_BZIP2FLAGS) $(EXTRA_BZIP2FLAGS) +BZIP2 := bzip2 + + +endif # include guard diff --git a/share/mk/configure/build-depends/cc.mk b/share/mk/configure/build-depends/cc.mk deleted file mode 100644 index 85470a4..0000000 --- a/share/mk/configure/build-depends/cc.mk +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 2024, Alejandro Colomar -# 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 - - -include $(MAKEFILEDIR)/configure/build-depends/coreutils.mk -include $(MAKEFILEDIR)/configure/build-depends/grep.mk -include $(MAKEFILEDIR)/configure/build-depends/sed.mk - - -CC := gcc - - -CC_VENDOR := \ - $(shell \ - $(CC) -v 2>&1 \ - | $(SED) -n '1p;$$p' \ - | $(SED) '/gcc version/s/.*/gcc/' \ - | $(SED) '/clang version/s/.*/clang/' \ - | $(SED) '/Apple LLVM version/s/.*/clang/' \ - | $(GREP) -e '^gcc$$' -e '^clang$$' \ - || $(ECHO) unknown; \ - ) - - -COMMON_CFLAGS := \ - -O3 \ - -flto \ - -Wall \ - -Wextra \ - -Werror \ - -Wstrict-prototypes \ - -Wdeclaration-after-statement \ - -Wno-error=unused-parameter \ - -Wno-error=sign-compare \ - -Wno-error=format \ - -Wno-error=uninitialized - - -GCC_CFLAGS := -fanalyzer - - -CLANG_CFLAGS := \ - -Weverything \ - -Wno-unsafe-buffer-usage - - -DEFAULT_CFLAGS := $(COMMON_CFLAGS) - -ifeq ($(CC_VENDOR),gcc) -DEFAULT_CFLAGS += $(GCC_CFLAGS) -else ifeq ($(CC_VENDOR),clang) -DEFAULT_CFLAGS += $(CLANG_CFLAGS) -endif - -EXTRA_CFLAGS := -CFLAGS := $(DEFAULT_CFLAGS) $(EXTRA_CFLAGS) - - -endif # include guard diff --git a/share/mk/configure/build-depends/checkpatch.mk b/share/mk/configure/build-depends/checkpatch.mk deleted file mode 100644 index 0b29d9f..0000000 --- a/share/mk/configure/build-depends/checkpatch.mk +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 2022-2024, Alejandro Colomar -# 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 - - -include $(MAKEFILEDIR)/configure/src.mk - - -CHECKPATCH_CONF := $(SYSCONFDIR)/checkpatch/checkpatch.conf -DEFAULT_CHECKPATCHFLAGS := -EXTRA_CHECKPATCHFLAGS := -CHECKPATCHFLAGS := $(DEFAULT_CHECKPATCHFLAGS) $(EXTRA_CHECKPATCHFLAGS) -CHECKPATCH := checkpatch - - -endif # include guard diff --git a/share/mk/configure/build-depends/checkpatch/checkpatch.mk b/share/mk/configure/build-depends/checkpatch/checkpatch.mk new file mode 100644 index 0000000..7100411 --- /dev/null +++ b/share/mk/configure/build-depends/checkpatch/checkpatch.mk @@ -0,0 +1,19 @@ +# Copyright 2022-2024, Alejandro Colomar +# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception + + +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_CHECKPATCH_CHECKPATCH_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_CHECKPATCH_CHECKPATCH_INCLUDED := 1 + + +include $(MAKEFILEDIR)/configure/directory_variables/src.mk + + +CHECKPATCH_CONF := $(SYSCONFDIR)/checkpatch/checkpatch.conf +DEFAULT_CHECKPATCHFLAGS := +EXTRA_CHECKPATCHFLAGS := +CHECKPATCHFLAGS := $(DEFAULT_CHECKPATCHFLAGS) $(EXTRA_CHECKPATCHFLAGS) +CHECKPATCH := checkpatch + + +endif # include guard diff --git a/share/mk/configure/build-depends/clang-tidy.mk b/share/mk/configure/build-depends/clang-tidy.mk deleted file mode 100644 index 2d818f9..0000000 --- a/share/mk/configure/build-depends/clang-tidy.mk +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 2022-2024, Alejandro Colomar -# 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 - - -include $(MAKEFILEDIR)/configure/src.mk - - -CLANG_TIDY_CONF := $(SYSCONFDIR)/clang-tidy/config.yaml -DEFAULT_CLANG_TIDYFLAGS := \ - --config-file=$(CLANG_TIDY_CONF) \ - --quiet \ - --use-color -EXTRA_CLANG_TIDYFLAGS := -CLANG_TIDYFLAGS := $(DEFAULT_CLANG_TIDYFLAGS) $(EXTRA_CLANG_TIDYFLAGS) -CLANG_TIDY := clang-tidy - - -endif # include guard diff --git a/share/mk/configure/build-depends/clang-tidy/clang-tidy.mk b/share/mk/configure/build-depends/clang-tidy/clang-tidy.mk new file mode 100644 index 0000000..809215d --- /dev/null +++ b/share/mk/configure/build-depends/clang-tidy/clang-tidy.mk @@ -0,0 +1,22 @@ +# Copyright 2022-2024, Alejandro Colomar +# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception + + +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_CLANG_TIDY_CLANG_TIDY_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_CLANG_TIDY_CLANG_TIDY_INCLUDED := 1 + + +include $(MAKEFILEDIR)/configure/directory_variables/src.mk + + +CLANG_TIDY_CONF := $(SYSCONFDIR)/clang-tidy/config.yaml +DEFAULT_CLANG_TIDYFLAGS := \ + --config-file=$(CLANG_TIDY_CONF) \ + --quiet \ + --use-color +EXTRA_CLANG_TIDYFLAGS := +CLANG_TIDYFLAGS := $(DEFAULT_CLANG_TIDYFLAGS) $(EXTRA_CLANG_TIDYFLAGS) +CLANG_TIDY := clang-tidy + + +endif # include guard diff --git a/share/mk/configure/build-depends/clang.mk b/share/mk/configure/build-depends/clang.mk deleted file mode 100644 index b44ccb5..0000000 --- a/share/mk/configure/build-depends/clang.mk +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 2024, Alejandro Colomar -# 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 - - -include $(MAKEFILEDIR)/configure/build-depends/cc.mk - - -DEFAULT_CLANGFLAGS := \ - $(COMMON_CFLAGS) \ - $(CLANG_CFLAGS) -EXTRA_CLANGFLAGS := -CLANGFLAGS := $(DEFAULT_CLANGFLAGS) $(EXTRA_CLANGFLAGS) - - -endif # include guard diff --git a/share/mk/configure/build-depends/clang/clang.mk b/share/mk/configure/build-depends/clang/clang.mk new file mode 100644 index 0000000..edb1254 --- /dev/null +++ b/share/mk/configure/build-depends/clang/clang.mk @@ -0,0 +1,19 @@ +# Copyright 2024, Alejandro Colomar +# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception + + +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_CLANG_CLANG_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_CLANG_CLANG_INCLUDED := 1 + + +include $(MAKEFILEDIR)/configure/build-depends/gcc/cc.mk + + +DEFAULT_CLANGFLAGS := \ + $(COMMON_CFLAGS) \ + $(CLANG_CFLAGS) +EXTRA_CLANGFLAGS := +CLANGFLAGS := $(DEFAULT_CLANGFLAGS) $(EXTRA_CLANGFLAGS) + + +endif # include guard 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 -# 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/coreutils/cat.mk b/share/mk/configure/build-depends/coreutils/cat.mk new file mode 100644 index 0000000..fa96595 --- /dev/null +++ b/share/mk/configure/build-depends/coreutils/cat.mk @@ -0,0 +1,12 @@ +# Copyright 2022-2024, Alejandro Colomar +# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception + + +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_COREUTILS_CAT_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_COREUTILS_CAT_INCLUDED := 1 + + +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 +# 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 +# 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 +# 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 +# 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 +# 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 +# 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 +# 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 +# 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 +# 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 +# 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 +# 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 +# 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 +# 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 +# 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 +# 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 +# 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.mk deleted file mode 100644 index b720898..0000000 --- a/share/mk/configure/build-depends/cpp.mk +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 2022-2024, Alejandro Colomar -# 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 - - -include $(MAKEFILEDIR)/configure/build-depends/cc.mk -include $(MAKEFILEDIR)/configure/build-depends/pkgconf.mk -include $(MAKEFILEDIR)/configure/verbose.mk - - -DEFAULT_CPPFLAGS := $(shell $(PKGCONF_CMD) --cflags $(PKGCONF_LIBS) $(HIDE_ERR)) -EXTRA_CPPFLAGS := -CPPFLAGS := $(DEFAULT_CPPFLAGS) $(EXTRA_CPPFLAGS) -CPP := $(CC) $(CFLAGS) -E - - -endif # include guard diff --git a/share/mk/configure/build-depends/cpp/cpp.mk b/share/mk/configure/build-depends/cpp/cpp.mk new file mode 100644 index 0000000..e1e2511 --- /dev/null +++ b/share/mk/configure/build-depends/cpp/cpp.mk @@ -0,0 +1,20 @@ +# Copyright 2022-2024, Alejandro Colomar +# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception + + +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_CPP_CPP_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_CPP_CPP_INCLUDED := 1 + + +include $(MAKEFILEDIR)/configure/build-depends/gcc/cc.mk +include $(MAKEFILEDIR)/configure/build-depends/pkgconf/pkgconf.mk +include $(MAKEFILEDIR)/configure/verbose.mk + + +DEFAULT_CPPFLAGS := $(shell $(PKGCONF_CMD) --cflags $(PKGCONF_LIBS) $(HIDE_ERR)) +EXTRA_CPPFLAGS := +CPPFLAGS := $(DEFAULT_CPPFLAGS) $(EXTRA_CPPFLAGS) +CPP := $(CC) $(CFLAGS) -E + + +endif # include guard diff --git a/share/mk/configure/build-depends/cppcheck.mk b/share/mk/configure/build-depends/cppcheck.mk deleted file mode 100644 index 93a9b75..0000000 --- a/share/mk/configure/build-depends/cppcheck.mk +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 2022-2024, Alejandro Colomar -# 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 - - -include $(MAKEFILEDIR)/configure/src.mk - - -CPPCHECK_SUPPRESS := $(SYSCONFDIR)/cppcheck/cppcheck.suppress -DEFAULT_CPPCHECKFLAGS := \ - --enable=all \ - --error-exitcode=2 \ - --inconclusive \ - --quiet \ - --suppressions-list=$(CPPCHECK_SUPPRESS) -EXTRA_CPPCHECKFLAGS := -CPPCHECKFLAGS := $(DEFAULT_CPPCHECKFLAGS) $(EXTRA_CPPCHECKFLAGS) -CPPCHECK := cppcheck - - -endif # include guard diff --git a/share/mk/configure/build-depends/cppcheck/cppcheck.mk b/share/mk/configure/build-depends/cppcheck/cppcheck.mk new file mode 100644 index 0000000..2a5d844 --- /dev/null +++ b/share/mk/configure/build-depends/cppcheck/cppcheck.mk @@ -0,0 +1,25 @@ +# Copyright 2022-2024, Alejandro Colomar +# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception + + +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_CPPCHECK_CPPCHECK_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_CPPCHECK_CPPCHECK_INCLUDED := 1 + + +include $(MAKEFILEDIR)/configure/directory_variables/src.mk + + +CPPCHECK_SUPPRESS := $(SYSCONFDIR)/cppcheck/cppcheck.suppress +DEFAULT_CPPCHECKFLAGS := \ + --enable=all \ + --error-exitcode=2 \ + --inconclusive \ + --check-level=exhaustive \ + --quiet \ + --suppressions-list=$(CPPCHECK_SUPPRESS) +EXTRA_CPPCHECKFLAGS := +CPPCHECKFLAGS := $(DEFAULT_CPPCHECKFLAGS) $(EXTRA_CPPCHECKFLAGS) +CPPCHECK := cppcheck + + +endif # include guard diff --git a/share/mk/configure/build-depends/cpplint.mk b/share/mk/configure/build-depends/cpplint.mk deleted file mode 100644 index 586d646..0000000 --- a/share/mk/configure/build-depends/cpplint.mk +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 2022-2024, Alejandro Colomar -# 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 - - -include $(MAKEFILEDIR)/configure/src.mk - - -CPPLINT_CONF := $(SYSCONFDIR)/cpplint/cpplint.cfg -DEFAULT_CPPLINTFLAGS := -EXTRA_CPPLINTFLAGS := -CPPLINTFLAGS := $(DEFAULT_CPPLINTFLAGS) $(EXTRA_CPPLINTFLAGS) -CPPLINT := cpplint - - -endif # include guard diff --git a/share/mk/configure/build-depends/cpplint/cpplint.mk b/share/mk/configure/build-depends/cpplint/cpplint.mk new file mode 100644 index 0000000..330315f --- /dev/null +++ b/share/mk/configure/build-depends/cpplint/cpplint.mk @@ -0,0 +1,19 @@ +# Copyright 2022-2024, Alejandro Colomar +# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception + + +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_CPPLINT_CPPLINT_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_CPPLINT_CPPLINT_INCLUDED := 1 + + +include $(MAKEFILEDIR)/configure/directory_variables/src.mk + + +CPPLINT_CONF := $(SYSCONFDIR)/cpplint/cpplint.cfg +DEFAULT_CPPLINTFLAGS := +EXTRA_CPPLINTFLAGS := +CPPLINTFLAGS := $(DEFAULT_CPPLINTFLAGS) $(EXTRA_CPPLINTFLAGS) +CPPLINT := cpplint + + +endif # include guard diff --git a/share/mk/configure/build-depends/diffoscope.mk b/share/mk/configure/build-depends/diffoscope.mk deleted file mode 100644 index a9e48b3..0000000 --- a/share/mk/configure/build-depends/diffoscope.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright 2024, Alejandro Colomar -# 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 - - -DIFFOSCOPE := diffoscope - - -endif # include guard diff --git a/share/mk/configure/build-depends/diffoscope/diffoscope.mk b/share/mk/configure/build-depends/diffoscope/diffoscope.mk new file mode 100644 index 0000000..032a0c6 --- /dev/null +++ b/share/mk/configure/build-depends/diffoscope/diffoscope.mk @@ -0,0 +1,12 @@ +# Copyright 2024, Alejandro Colomar +# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception + + +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_DIFFOSCOPE_DIFFOSCOPE_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_DIFFOSCOPE_DIFFOSCOPE_INCLUDED := 1 + + +DIFFOSCOPE := diffoscope + + +endif # include guard diff --git a/share/mk/configure/build-depends/findutils.mk b/share/mk/configure/build-depends/findutils.mk deleted file mode 100644 index 536f921..0000000 --- a/share/mk/configure/build-depends/findutils.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 2022-2024, Alejandro Colomar -# 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 - - -FIND := find -XARGS := xargs - - -endif # include guard 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 +# 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 +# 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 +# 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/gcc/cc.mk b/share/mk/configure/build-depends/gcc/cc.mk new file mode 100644 index 0000000..9481865 --- /dev/null +++ b/share/mk/configure/build-depends/gcc/cc.mk @@ -0,0 +1,65 @@ +# Copyright 2024, Alejandro Colomar +# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception + + +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_GCC_CC_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_GCC_CC_INCLUDED := 1 + + +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 + + +CC_VENDOR := \ + $(shell \ + $(CC) -v 2>&1 \ + | $(SED) -n '1p;$$p' \ + | $(SED) '/gcc version/s/.*/gcc/' \ + | $(SED) '/clang version/s/.*/clang/' \ + | $(SED) '/Apple LLVM version/s/.*/clang/' \ + | $(GREP) -e '^gcc$$' -e '^clang$$' \ + || $(ECHO) unknown; \ + ) + + +COMMON_CFLAGS := \ + -O3 \ + -flto \ + -Wall \ + -Wextra \ + -Werror \ + -Wstrict-prototypes \ + -Wdeclaration-after-statement \ + -Wno-reserved-identifier \ + -Wno-unused-macros \ + -Wno-error=unused-parameter \ + -Wno-error=sign-compare \ + -Wno-error=format \ + -Wno-error=uninitialized + + +GCC_CFLAGS := -fanalyzer + + +CLANG_CFLAGS := \ + -Weverything \ + -Wno-unsafe-buffer-usage + + +DEFAULT_CFLAGS := $(COMMON_CFLAGS) + +ifeq ($(CC_VENDOR),gcc) +DEFAULT_CFLAGS += $(GCC_CFLAGS) +else ifeq ($(CC_VENDOR),clang) +DEFAULT_CFLAGS += $(CLANG_CFLAGS) +endif + +EXTRA_CFLAGS := +CFLAGS := $(DEFAULT_CFLAGS) $(EXTRA_CFLAGS) + + +endif # include guard diff --git a/share/mk/configure/build-depends/git.mk b/share/mk/configure/build-depends/git.mk deleted file mode 100644 index a861bed..0000000 --- a/share/mk/configure/build-depends/git.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright 2022-2024, Alejandro Colomar -# 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 - - -GIT := git - - -endif # include guard diff --git a/share/mk/configure/build-depends/git/git.mk b/share/mk/configure/build-depends/git/git.mk new file mode 100644 index 0000000..29c3090 --- /dev/null +++ b/share/mk/configure/build-depends/git/git.mk @@ -0,0 +1,12 @@ +# Copyright 2022-2024, Alejandro Colomar +# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception + + +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_GIT_GIT_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_GIT_GIT_INCLUDED := 1 + + +GIT := git + + +endif # include guard diff --git a/share/mk/configure/build-depends/grep.mk b/share/mk/configure/build-depends/grep.mk deleted file mode 100644 index 7d89691..0000000 --- a/share/mk/configure/build-depends/grep.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright 2022-2024, Alejandro Colomar -# 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 - - -GREP := grep - - -endif # include guard diff --git a/share/mk/configure/build-depends/grep/grep.mk b/share/mk/configure/build-depends/grep/grep.mk new file mode 100644 index 0000000..9b1afa5 --- /dev/null +++ b/share/mk/configure/build-depends/grep/grep.mk @@ -0,0 +1,12 @@ +# Copyright 2022-2024, Alejandro Colomar +# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception + + +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_GREP_GREP_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_GREP_GREP_INCLUDED := 1 + + +GREP := grep + + +endif # include guard 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 -# 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 +# 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 +# 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 +# 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 +# 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 +# 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 +# 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 +# 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 +# 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.mk b/share/mk/configure/build-depends/groff.mk deleted file mode 100644 index ea0c7a3..0000000 --- a/share/mk/configure/build-depends/groff.mk +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 2024, Alejandro Colomar -# 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 - - -DEFAULT_POST_GROHTMLFLAGS := -EXTRA_POST_GROHTMLFLAGS := -POST_GROHTMLFLAGS := $(DEFAULT_POST_GROHTMLFLAGS) $(EXTRA_POST_GROHTMLFLAGS) -POST_GROHTML := post-grohtml - - -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 +# 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 +# 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 +# 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/post-grohtml.mk b/share/mk/configure/build-depends/groff/post-grohtml.mk new file mode 100644 index 0000000..700c0e2 --- /dev/null +++ b/share/mk/configure/build-depends/groff/post-grohtml.mk @@ -0,0 +1,15 @@ +# Copyright 2024, Alejandro Colomar +# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception + + +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_GROFF_POST_GROHTML_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_GROFF_POST_GROHTML_INCLUDED := 1 + + +DEFAULT_POST_GROHTMLFLAGS := +EXTRA_POST_GROHTMLFLAGS := +POST_GROHTMLFLAGS := $(DEFAULT_POST_GROHTMLFLAGS) $(EXTRA_POST_GROHTMLFLAGS) +POST_GROHTML := post-grohtml + + +endif # include guard diff --git a/share/mk/configure/build-depends/gzip.mk b/share/mk/configure/build-depends/gzip.mk deleted file mode 100644 index 6633654..0000000 --- a/share/mk/configure/build-depends/gzip.mk +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 2023-2024, Alejandro Colomar -# 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 - - -DEFAULT_GZIPFLAGS := -n -EXTRA_GZIPFLAGS := -GZIPFLAGS := $(DEFAULT_GZIPFLAGS) $(EXTRA_GZIPFLAGS) -GZIP := gzip - - -endif # include guard diff --git a/share/mk/configure/build-depends/gzip/gzip.mk b/share/mk/configure/build-depends/gzip/gzip.mk new file mode 100644 index 0000000..0e37483 --- /dev/null +++ b/share/mk/configure/build-depends/gzip/gzip.mk @@ -0,0 +1,15 @@ +# Copyright 2023-2024, Alejandro Colomar +# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception + + +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_GZIP_GZIP_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_GZIP_GZIP_INCLUDED := 1 + + +DEFAULT_GZIPFLAGS := -n +EXTRA_GZIPFLAGS := +GZIPFLAGS := $(DEFAULT_GZIPFLAGS) $(EXTRA_GZIPFLAGS) +GZIP := gzip + + +endif # include guard diff --git a/share/mk/configure/build-depends/iwyu.mk b/share/mk/configure/build-depends/iwyu.mk deleted file mode 100644 index bd5cf7f..0000000 --- a/share/mk/configure/build-depends/iwyu.mk +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 2022-2024, Alejandro Colomar -# 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 - - -DEFAULT_IWYUFLAGS := \ - -Xiwyu --no_fwd_decls \ - -Xiwyu --error -EXTRA_IWYUFLAGS := -IWYUFLAGS := $(DEFAULT_IWYUFLAGS) $(EXTRA_IWYUFLAGS) -IWYU := iwyu - - -endif # include guard diff --git a/share/mk/configure/build-depends/iwyu/iwyu.mk b/share/mk/configure/build-depends/iwyu/iwyu.mk new file mode 100644 index 0000000..4c0d707 --- /dev/null +++ b/share/mk/configure/build-depends/iwyu/iwyu.mk @@ -0,0 +1,17 @@ +# Copyright 2022-2024, Alejandro Colomar +# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception + + +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_IWYU_IWYU_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_IWYU_IWYU_INCLUDED := 1 + + +DEFAULT_IWYUFLAGS := \ + -Xiwyu --no_fwd_decls \ + -Xiwyu --error +EXTRA_IWYUFLAGS := +IWYUFLAGS := $(DEFAULT_IWYUFLAGS) $(EXTRA_IWYUFLAGS) +IWYU := iwyu + + +endif # include guard diff --git a/share/mk/configure/build-depends/ld.mk b/share/mk/configure/build-depends/ld.mk deleted file mode 100644 index a78a189..0000000 --- a/share/mk/configure/build-depends/ld.mk +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 2022-2024, Alejandro Colomar -# 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 - - -include $(MAKEFILEDIR)/configure/build-depends/cc.mk -include $(MAKEFILEDIR)/configure/build-depends/coreutils.mk -include $(MAKEFILEDIR)/configure/build-depends/pkgconf.mk -include $(MAKEFILEDIR)/configure/verbose.mk - - -LD := $(CC) $(CFLAGS) - - -LD_HAS_FUSE_LINKER_PLUGIN := \ - $(shell \ - $(ECHO) 'int main(void) {}' \ - | $(LD) -fuse-linker-plugin -x c -o /dev/null /dev/stdin $(HIDE_ERR) \ - && $(ECHO) yes \ - || $(ECHO) no; \ - ) - - -DEFAULT_LDFLAGS := \ - -Wl,--as-needed \ - -Wl,--no-allow-shlib-undefined \ - -Wl,--no-copy-dt-needed-entries \ - -Wl,--no-undefined \ - $(shell $(PKGCONF_CMD) --libs-only-L $(PKGCONF_LIBS) $(HIDE_ERR)) \ - $(shell $(PKGCONF_CMD) --libs-only-other $(PKGCONF_LIBS) $(HIDE_ERR)) - -ifeq ($(LD_HAS_FUSE_LINKER_PLUGIN),yes) -DEFAULT_LDFLAGS += -fuse-linker-plugin -endif - -EXTRA_LDFLAGS := -LDFLAGS := $(DEFAULT_LDFLAGS) $(EXTRA_LDFLAGS) - - -DEFAULT_LDLIBS := \ - -lc \ - $(shell $(PKGCONF_CMD) --libs-only-l $(PKGCONF_LIBS) $(HIDE_ERR)) -EXTRA_LDLIBS := -LDLIBS := $(DEFAULT_LDLIBS) $(EXTRA_LDLIBS) - - -endif # include guard diff --git a/share/mk/configure/build-depends/libc-bin.mk b/share/mk/configure/build-depends/libc-bin.mk deleted file mode 100644 index 281502b..0000000 --- a/share/mk/configure/build-depends/libc-bin.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright 2024, Alejandro Colomar -# 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 - - -LOCALE := locale - - -endif # include guard diff --git a/share/mk/configure/build-depends/libc-bin/locale.mk b/share/mk/configure/build-depends/libc-bin/locale.mk new file mode 100644 index 0000000..fe670f4 --- /dev/null +++ b/share/mk/configure/build-depends/libc-bin/locale.mk @@ -0,0 +1,12 @@ +# Copyright 2024, Alejandro Colomar +# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception + + +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_LIBC_BIN_LOCALE_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_LIBC_BIN_LOCALE_INCLUDED := 1 + + +LOCALE := locale + + +endif # include guard diff --git a/share/mk/configure/build-depends/lzip.mk b/share/mk/configure/build-depends/lzip.mk deleted file mode 100644 index e18868f..0000000 --- a/share/mk/configure/build-depends/lzip.mk +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 2023-2024, Alejandro Colomar -# 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 - - -DEFAULT_LZIPFLAGS := -EXTRA_LZIPFLAGS := -LZIPFLAGS := $(DEFAULT_LZIPFLAGS) $(EXTRA_LZIPFLAGS) -LZIP := lzip - - -endif # include guard diff --git a/share/mk/configure/build-depends/lzip/lzip.mk b/share/mk/configure/build-depends/lzip/lzip.mk new file mode 100644 index 0000000..e2a0d82 --- /dev/null +++ b/share/mk/configure/build-depends/lzip/lzip.mk @@ -0,0 +1,15 @@ +# Copyright 2023-2024, Alejandro Colomar +# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception + + +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_LZIP_LZIP_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_LZIP_LZIP_INCLUDED := 1 + + +DEFAULT_LZIPFLAGS := +EXTRA_LZIPFLAGS := +LZIPFLAGS := $(DEFAULT_LZIPFLAGS) $(EXTRA_LZIPFLAGS) +LZIP := lzip + + +endif # include guard diff --git a/share/mk/configure/build-depends/man.mk b/share/mk/configure/build-depends/man.mk deleted file mode 100644 index 5248d42..0000000 --- a/share/mk/configure/build-depends/man.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright 2024, Alejandro Colomar -# 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 - - -MANWIDTH ?= 80 - - -endif # include guard diff --git a/share/mk/configure/build-depends/man/man.mk b/share/mk/configure/build-depends/man/man.mk new file mode 100644 index 0000000..22ce6c0 --- /dev/null +++ b/share/mk/configure/build-depends/man/man.mk @@ -0,0 +1,12 @@ +# Copyright 2024, Alejandro Colomar +# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception + + +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_MAN_MAN_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_MAN_MAN_INCLUDED := 1 + + +MANWIDTH ?= 80 + + +endif # include guard diff --git a/share/mk/configure/build-depends/mandoc.mk b/share/mk/configure/build-depends/mandoc.mk deleted file mode 100644 index 87eccd6..0000000 --- a/share/mk/configure/build-depends/mandoc.mk +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 2024, Alejandro Colomar -# 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 - - -DEFAULT_MANDOCFLAGS := -Tlint -EXTRA_MANDOCFLAGS := -MANDOCFLAGS := $(DEFAULT_MANDOCFLAGS) $(EXTRA_MANDOCFLAGS) -MANDOC := mandoc - - -endif # include guard diff --git a/share/mk/configure/build-depends/mandoc/mandoc.mk b/share/mk/configure/build-depends/mandoc/mandoc.mk new file mode 100644 index 0000000..80c5b04 --- /dev/null +++ b/share/mk/configure/build-depends/mandoc/mandoc.mk @@ -0,0 +1,15 @@ +# Copyright 2024, Alejandro Colomar +# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception + + +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_MANDOC_MANDOC_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_MANDOC_MANDOC_INCLUDED := 1 + + +DEFAULT_MANDOCFLAGS := -Tlint +EXTRA_MANDOCFLAGS := +MANDOCFLAGS := $(DEFAULT_MANDOCFLAGS) $(EXTRA_MANDOCFLAGS) +MANDOC := mandoc + + +endif # include guard diff --git a/share/mk/configure/build-depends/moreutils.mk b/share/mk/configure/build-depends/moreutils.mk deleted file mode 100644 index 69b60fa..0000000 --- a/share/mk/configure/build-depends/moreutils.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright 2024, Alejandro Colomar -# 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 - - -SPONGE := sponge - - -endif # include guard diff --git a/share/mk/configure/build-depends/moreutils/sponge.mk b/share/mk/configure/build-depends/moreutils/sponge.mk new file mode 100644 index 0000000..e9b8989 --- /dev/null +++ b/share/mk/configure/build-depends/moreutils/sponge.mk @@ -0,0 +1,12 @@ +# Copyright 2024, Alejandro Colomar +# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception + + +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_MOREUTILS_SPONGE_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_MOREUTILS_SPONGE_INCLUDED := 1 + + +SPONGE := sponge + + +endif # include guard diff --git a/share/mk/configure/build-depends/pkgconf.mk b/share/mk/configure/build-depends/pkgconf.mk deleted file mode 100644 index b7b5c3f..0000000 --- a/share/mk/configure/build-depends/pkgconf.mk +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 2022-2024, Alejandro Colomar -# 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 - - -# Compat -PKG_CONFIG := pkgconf - - -DEFAULT_PKGCONFFLAGS := -EXTRA_PKGCONFFLAGS := -PKGCONFFLAGS := $(DEFAULT_PKGCONFFLAGS) $(EXTRA_PKGCONFFLAGS) -PKGCONF := $(PKG_CONFIG) -PKGCONF_CMD := $(PKGCONF) $(PKGCONFFLAGS) - - -PKGCONF_LIBS := libbsd-overlay - - -endif # include guard diff --git a/share/mk/configure/build-depends/pkgconf/pkgconf.mk b/share/mk/configure/build-depends/pkgconf/pkgconf.mk new file mode 100644 index 0000000..f6bc885 --- /dev/null +++ b/share/mk/configure/build-depends/pkgconf/pkgconf.mk @@ -0,0 +1,23 @@ +# Copyright 2022-2024, Alejandro Colomar +# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception + + +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_PKGCONF_PKGCONF_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_PKGCONF_PKGCONF_INCLUDED := 1 + + +# Compat +PKG_CONFIG := pkgconf + + +DEFAULT_PKGCONFFLAGS := +EXTRA_PKGCONFFLAGS := +PKGCONFFLAGS := $(DEFAULT_PKGCONFFLAGS) $(EXTRA_PKGCONFFLAGS) +PKGCONF := $(PKG_CONFIG) +PKGCONF_CMD := $(PKGCONF) $(PKGCONFFLAGS) + + +PKGCONF_LIBS := libbsd-overlay + + +endif # include guard diff --git a/share/mk/configure/build-depends/sed.mk b/share/mk/configure/build-depends/sed.mk deleted file mode 100644 index 3d1fcd8..0000000 --- a/share/mk/configure/build-depends/sed.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright 2022-2024, Alejandro Colomar -# 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 - - -SED := sed - - -endif # include guard diff --git a/share/mk/configure/build-depends/sed/sed.mk b/share/mk/configure/build-depends/sed/sed.mk new file mode 100644 index 0000000..30dcf20 --- /dev/null +++ b/share/mk/configure/build-depends/sed/sed.mk @@ -0,0 +1,12 @@ +# Copyright 2022-2024, Alejandro Colomar +# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception + + +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_SED_SED_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_SED_SED_INCLUDED := 1 + + +SED := sed + + +endif # include guard diff --git a/share/mk/configure/build-depends/tar.mk b/share/mk/configure/build-depends/tar.mk deleted file mode 100644 index 3ea5537..0000000 --- a/share/mk/configure/build-depends/tar.mk +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 2021-2024, Alejandro Colomar -# 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 - - -include $(MAKEFILEDIR)/configure/version.mk - - -DEFAULT_TARFLAGS := \ - --sort=name \ - --owner=root:0 \ - --group=root:0 \ - --mtime='$(DISTDATE)' -EXTRA_TARFLAGS := -TARFLAGS := $(DEFAULT_TARFLAGS) $(EXTRA_TARFLAGS) -TAR := tar - - -endif # include guard diff --git a/share/mk/configure/build-depends/tar/tar.mk b/share/mk/configure/build-depends/tar/tar.mk new file mode 100644 index 0000000..d9b87db --- /dev/null +++ b/share/mk/configure/build-depends/tar/tar.mk @@ -0,0 +1,22 @@ +# Copyright 2021-2024, Alejandro Colomar +# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception + + +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_TAR_TAR_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_TAR_TAR_INCLUDED := 1 + + +include $(MAKEFILEDIR)/configure/version.mk + + +DEFAULT_TARFLAGS := \ + --sort=name \ + --owner=root:0 \ + --group=root:0 \ + --mtime='$(DISTDATE)' +EXTRA_TARFLAGS := +TARFLAGS := $(DEFAULT_TARFLAGS) $(EXTRA_TARFLAGS) +TAR := tar + + +endif # include guard 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 +# 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 +# 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.mk deleted file mode 100644 index d00a3b7..0000000 --- a/share/mk/configure/build-depends/xz-utils.mk +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 2023-2024, Alejandro Colomar -# 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 - - -DEFAULT_XZFLAGS := -EXTRA_XZFLAGS := -XZFLAGS := $(DEFAULT_XZFLAGS) $(EXTRA_XZFLAGS) -XZ := xz - - -endif # include guard diff --git a/share/mk/configure/build-depends/xz-utils/xz.mk b/share/mk/configure/build-depends/xz-utils/xz.mk new file mode 100644 index 0000000..c3c772b --- /dev/null +++ b/share/mk/configure/build-depends/xz-utils/xz.mk @@ -0,0 +1,15 @@ +# Copyright 2023-2024, Alejandro Colomar +# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception + + +ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_XZ_UTILS_XZ_INCLUDED +MAKEFILE_CONFIGURE_BUILD_DEPENDS_XZ_UTILS_XZ_INCLUDED := 1 + + +DEFAULT_XZFLAGS := +EXTRA_XZFLAGS := +XZFLAGS := $(DEFAULT_XZFLAGS) $(EXTRA_XZFLAGS) +XZ := xz + + +endif # include guard diff --git a/share/mk/configure/directory_variables.mk b/share/mk/configure/directory_variables.mk deleted file mode 100644 index e4ee616..0000000 --- a/share/mk/configure/directory_variables.mk +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 2021-2024, Alejandro Colomar -# 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 - - -include $(MAKEFILEDIR)/src.mk - - -builddir := .tmp - - -DESTDIR := -prefix := /usr/local -datarootdir := $(prefix)/share -docdir := $(datarootdir)/doc -htmldir := $(docdir)/html/man -mandir := $(datarootdir)/man - - -$(foreach s, $(MANSECTIONS), \ - $(eval man$(s)dir := $(mandir)/man$(s))) -$(foreach s, $(MANSECTIONS), \ - $(eval man$(s)ext := .$(s))) - - -endif # include guard 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 +# 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/install.mk b/share/mk/configure/directory_variables/install.mk new file mode 100644 index 0000000..cd5fda6 --- /dev/null +++ b/share/mk/configure/directory_variables/install.mk @@ -0,0 +1,27 @@ +# Copyright 2021-2024, Alejandro Colomar +# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception + + +ifndef MAKEFILE_CONFIGURE_DIRECTORY_VARIABLES_INSTALL_INCLUDED +MAKEFILE_CONFIGURE_DIRECTORY_VARIABLES_INSTALL_INCLUDED := 1 + + +include $(MAKEFILEDIR)/configure/directory_variables/src.mk + + +DESTDIR := +prefix := /usr/local +datarootdir := $(prefix)/share +mandir := $(datarootdir)/man +docdir := $(datarootdir)/doc +htmldir := $(docdir)/html/man +pdfdir := $(docdir)/pdf + + +$(foreach s, $(MANSECTIONS), \ + $(eval man$(s)dir := $(mandir)/man$(s))) +$(foreach s, $(MANSECTIONS), \ + $(eval man$(s)ext := .$(s))) + + +endif # include guard 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 +# 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/link_pages.mk deleted file mode 100644 index 52136ef..0000000 --- a/share/mk/configure/link_pages.mk +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 2023-2024, Alejandro Colomar -# 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 - - -LINK_PAGES := .so -ifeq ($(LINK_PAGES),.so) -else ifeq ($(LINK_PAGES),symlink) -else -$(warning "LINK_PAGES": "$(LINK_PAGES)") -$(error Valid values for "LINK_PAGES": [".so", "symlink"]) -endif - - -endif # include guard diff --git a/share/mk/configure/man/link_pages.mk b/share/mk/configure/man/link_pages.mk new file mode 100644 index 0000000..8e9c56c --- /dev/null +++ b/share/mk/configure/man/link_pages.mk @@ -0,0 +1,18 @@ +# Copyright 2023-2024, Alejandro Colomar +# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception + + +ifndef MAKEFILE_CONFIGURE_MAN_LINK_PAGES_INCLUDED +MAKEFILE_CONFIGURE_MAN_LINK_PAGES_INCLUDED := 1 + + +LINK_PAGES := .so +ifeq ($(LINK_PAGES),.so) +else ifeq ($(LINK_PAGES),symlink) +else +$(warning "LINK_PAGES": "$(LINK_PAGES)") +$(error Valid values for "LINK_PAGES": [".so", "symlink"]) +endif + + +endif # include guard 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 -# 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 -# 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 -- cgit v1.2.3