[PR #5140] [MERGED] build: deduplicate configure-time vars into new config files #5376

New issue

Closed

opened 2026-05-05 10:37:18 -06:00 by gitea-mirror · 0 comments

gitea-mirror commented

2026-05-05 10:37:18 -06:00

Owner

📋 Pull Request Information

Original PR: https://github.com/netblue30/firejail/pull/5140
Author: @kmk3
Created: 5/12/2022
Status: ✅ Merged
Merged: 6/13/2022
Merged by: @kmk3

Base: master ← Head: build-dedup-config-vars

📝 Commits (10+)

ef9d3f3 configure*: run autoconf
f034475 configure*: list one file per line on AC_CONFIG_FILES
6286678 configure*: sort AC_CONFIG_FILES
ac1d176 Makefile.in: remove redundant quotes around DISTFILES vars
ecfc9e1 Makefile.in: list one file per line on DISTFILES
e7dadcf Makefile.in: sort DISTFILES
3438ef7 Makefile.in: stop trying to remove config.h on distclean
000f094 common.mk.in: fix comment about file usage intent
da6d855 makefiles: define root dir and include relative to it
4e8244f makefiles: deduplicate configure-time vars into new config.mk.in

📊 Changes

34 files changed (+205 additions, -129 deletions)

View changed files

📝 .gitignore (+2 -0)
📝 Makefile.in (+26 -22)
➕ config.mk.in (+58 -0)
➕ config.sh.in (+2 -0)
📝 configure (+25 -23)
📝 configure.ac (+33 -5)
📝 mkdeb.sh.in (+3 -2)
📝 src/bash_completion/Makefile.in (+2 -1)
📝 src/common.mk.in (+4 -39)
📝 src/fbuilder/Makefile.in (+2 -1)
📝 src/fcopy/Makefile.in (+2 -1)
📝 src/fids/Makefile.in (+2 -1)
📝 src/firecfg/Makefile.in (+2 -1)
📝 src/firejail/Makefile.in (+2 -1)
📝 src/firemon/Makefile.in (+2 -1)
📝 src/fldd/Makefile.in (+2 -1)
📝 src/fnet/Makefile.in (+2 -1)
📝 src/fnetfilter/Makefile.in (+2 -1)
📝 src/fnettrace-dns/Makefile.in (+2 -1)
📝 src/fnettrace-sni/Makefile.in (+2 -1)

...and 14 more files

📄 Description

makefiles: deduplicate configure-time vars into new config.mk.in

Currently, the configure-time variables (that is, the ones that assign
to placeholders, such as "@HAVE_MAN@", which are set/replaced at
configure-time) are defined on multiple files (such as on Makefile.in
and on common.mk.in).

To avoid duplication, centralize these variables on a single file
(config.mk.in) and replace all of the other definitions of them with an
include of config.mk.

mkdeb.sh.in: move configure-time vars into new config.sh.in

For better organization and so that they can be used by other shell
scripts by just sourcing config.sh.

Relates to #646.

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/netblue30/firejail/pull/5140 **Author:** [@kmk3](https://github.com/kmk3) **Created:** 5/12/2022 **Status:** ✅ Merged **Merged:** 6/13/2022 **Merged by:** [@kmk3](https://github.com/kmk3) **Base:** `master` ← **Head:** `build-dedup-config-vars` --- ### 📝 Commits (10+) - [`ef9d3f3`](https://github.com/netblue30/firejail/commit/ef9d3f3a6226402bf4084020e124c4cab58519cd) configure*: run autoconf - [`f034475`](https://github.com/netblue30/firejail/commit/f0344753d72078f2d9ead6b8086ea7e5dc07f886) configure*: list one file per line on AC_CONFIG_FILES - [`6286678`](https://github.com/netblue30/firejail/commit/62866784b4cc20b0b20f511dbb1a4ad2907bbe09) configure*: sort AC_CONFIG_FILES - [`ac1d176`](https://github.com/netblue30/firejail/commit/ac1d176703870492a4517a22406660e50044630f) Makefile.in: remove redundant quotes around DISTFILES vars - [`ecfc9e1`](https://github.com/netblue30/firejail/commit/ecfc9e125ed64dad1e7de4ab0b5b14c98f2be411) Makefile.in: list one file per line on DISTFILES - [`e7dadcf`](https://github.com/netblue30/firejail/commit/e7dadcfa97cfd51f013542ae44020d0ff9c72b75) Makefile.in: sort DISTFILES - [`3438ef7`](https://github.com/netblue30/firejail/commit/3438ef725fa086191e9d1c08dd943a48103c8e6c) Makefile.in: stop trying to remove config.h on distclean - [`000f094`](https://github.com/netblue30/firejail/commit/000f094c1ba0975061c66cf7e60819b0dc5fe8c0) common.mk.in: fix comment about file usage intent - [`da6d855`](https://github.com/netblue30/firejail/commit/da6d855dc29e0db10ecf1065f9860a2874b6bf07) makefiles: define root dir and include relative to it - [`4e8244f`](https://github.com/netblue30/firejail/commit/4e8244fb81e17840cf1e0c2410683992c25867a9) makefiles: deduplicate configure-time vars into new config.mk.in ### 📊 Changes **34 files changed** (+205 additions, -129 deletions) <details> <summary>View changed files</summary> 📝 `.gitignore` (+2 -0) 📝 `Makefile.in` (+26 -22) ➕ `config.mk.in` (+58 -0) ➕ `config.sh.in` (+2 -0) 📝 `configure` (+25 -23) 📝 `configure.ac` (+33 -5) 📝 `mkdeb.sh.in` (+3 -2) 📝 `src/bash_completion/Makefile.in` (+2 -1) 📝 `src/common.mk.in` (+4 -39) 📝 `src/fbuilder/Makefile.in` (+2 -1) 📝 `src/fcopy/Makefile.in` (+2 -1) 📝 `src/fids/Makefile.in` (+2 -1) 📝 `src/firecfg/Makefile.in` (+2 -1) 📝 `src/firejail/Makefile.in` (+2 -1) 📝 `src/firemon/Makefile.in` (+2 -1) 📝 `src/fldd/Makefile.in` (+2 -1) 📝 `src/fnet/Makefile.in` (+2 -1) 📝 `src/fnetfilter/Makefile.in` (+2 -1) 📝 `src/fnettrace-dns/Makefile.in` (+2 -1) 📝 `src/fnettrace-sni/Makefile.in` (+2 -1) _...and 14 more files_ </details> ### 📄 Description makefiles: deduplicate configure-time vars into new config.mk.in Currently, the configure-time variables (that is, the ones that assign to placeholders, such as "@HAVE_MAN@", which are set/replaced at configure-time) are defined on multiple files (such as on Makefile.in and on common.mk.in). To avoid duplication, centralize these variables on a single file (config.mk.in) and replace all of the other definitions of them with an include of config.mk. --- mkdeb.sh.in: move configure-time vars into new config.sh.in For better organization and so that they can be used by other shell scripts by just sourcing config.sh. --- Relates to #646. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>

gitea-mirror

2026-05-05 10:37:18 -06:00

closed this issue
added the
pull-request
label

gitea-mirror referenced this issue

2026-05-05 10:39:01 -06:00

[PR #5376] [MERGED] .git-blame-ignore-revs: change format and add Landlock v1 #5470

No milestone

No project

No assignees

1 participant

Notifications

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: github-starred/firejail#5376

No description provided.

Rows
Columns