diff options
author | Kelvin M. Klann <kmk3.code@protonmail.com> | 2024-02-12 08:58:58 -0300 |
---|---|---|
committer | Kelvin M. Klann <kmk3.code@protonmail.com> | 2024-02-29 08:52:25 -0300 |
commit | 2301ab23488b9db95eba40750f355a4439468b89 (patch) | |
tree | df1c57c465dea764eee0badaf08e1c53a89ea70b /.github | |
parent | build: standardize parallel make arguments (diff) | |
download | firejail-2301ab23488b9db95eba40750f355a4439468b89.tar.gz firejail-2301ab23488b9db95eba40750f355a4439468b89.tar.zst firejail-2301ab23488b9db95eba40750f355a4439468b89.zip |
build: standardize ./configure arguments
For consistency and to make it clearer where jobs differ (for example,
to see where `--enable-analyzer` is used).
Changes:
* Always use --prefix=/usr and --enable-fatal-warnings (except in the
Alpine job due to current warnings; see #6224)
* Use the same argument order
Note: mkdeb.sh and platform/rpm/mkrpm.sh already pass `--prefix=/usr` to
./configure.
Diffstat (limited to '.github')
-rw-r--r-- | .github/workflows/build-extra.yml | 5 | ||||
-rw-r--r-- | .github/workflows/build.yml | 5 | ||||
-rw-r--r-- | .github/workflows/check-c.yml | 3 | ||||
-rw-r--r-- | .github/workflows/test.yml | 25 |
4 files changed, 23 insertions, 15 deletions
diff --git a/.github/workflows/build-extra.yml b/.github/workflows/build-extra.yml index b0752042d..e18ab9f0c 100644 --- a/.github/workflows/build-extra.yml +++ b/.github/workflows/build-extra.yml | |||
@@ -63,8 +63,9 @@ jobs: | |||
63 | run: ./ci/printenv.sh | 63 | run: ./ci/printenv.sh |
64 | - name: configure | 64 | - name: configure |
65 | run: > | 65 | run: > |
66 | CC=clang-14 ./configure --enable-fatal-warnings --enable-apparmor | 66 | ./configure CC=clang-14 |
67 | --enable-selinux | 67 | --prefix=/usr --enable-fatal-warnings |
68 | --enable-apparmor --enable-selinux | ||
68 | || (cat config.log; exit 1) | 69 | || (cat config.log; exit 1) |
69 | - name: make | 70 | - name: make |
70 | run: make | 71 | run: make |
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f33670e63..a005fefd7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml | |||
@@ -79,8 +79,9 @@ jobs: | |||
79 | run: ./ci/printenv.sh | 79 | run: ./ci/printenv.sh |
80 | - name: configure | 80 | - name: configure |
81 | run: > | 81 | run: > |
82 | CC=gcc-12 ./configure --prefix=/usr --enable-fatal-warnings | 82 | ./configure CC=gcc-12 |
83 | --enable-analyzer --enable-apparmor --enable-selinux | 83 | --prefix=/usr --enable-fatal-warnings --enable-analyzer |
84 | --enable-apparmor --enable-selinux | ||
84 | || (cat config.log; exit 1) | 85 | || (cat config.log; exit 1) |
85 | - name: make | 86 | - name: make |
86 | run: make | 87 | run: make |
diff --git a/.github/workflows/check-c.yml b/.github/workflows/check-c.yml index dd841c394..49c9b38a7 100644 --- a/.github/workflows/check-c.yml +++ b/.github/workflows/check-c.yml | |||
@@ -68,7 +68,8 @@ jobs: | |||
68 | - name: configure | 68 | - name: configure |
69 | run: > | 69 | run: > |
70 | ./configure CC=clang-14 SCAN_BUILD=scan-build-14 | 70 | ./configure CC=clang-14 SCAN_BUILD=scan-build-14 |
71 | --enable-fatal-warnings --enable-apparmor --enable-selinux | 71 | --prefix=/usr --enable-fatal-warnings |
72 | --enable-apparmor --enable-selinux | ||
72 | || (cat config.log; exit 1) | 73 | || (cat config.log; exit 1) |
73 | - name: scan-build | 74 | - name: scan-build |
74 | run: make scan-build | 75 | run: make scan-build |
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3e7153c46..f0aeafc9a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml | |||
@@ -73,8 +73,9 @@ jobs: | |||
73 | run: ./ci/printenv.sh | 73 | run: ./ci/printenv.sh |
74 | - name: configure | 74 | - name: configure |
75 | run: > | 75 | run: > |
76 | CC=gcc-12 ./configure --prefix=/usr --enable-fatal-warnings | 76 | ./configure CC=gcc-12 |
77 | --enable-analyzer --enable-apparmor --enable-selinux | 77 | --prefix=/usr --enable-fatal-warnings --enable-analyzer |
78 | --enable-apparmor --enable-selinux | ||
78 | || (cat config.log; exit 1) | 79 | || (cat config.log; exit 1) |
79 | - name: make | 80 | - name: make |
80 | run: make -j "$(nproc)" | 81 | run: make -j "$(nproc)" |
@@ -121,8 +122,9 @@ jobs: | |||
121 | run: ./ci/printenv.sh | 122 | run: ./ci/printenv.sh |
122 | - name: configure | 123 | - name: configure |
123 | run: > | 124 | run: > |
124 | CC=gcc-12 ./configure --prefix=/usr --enable-fatal-warnings | 125 | ./configure CC=gcc-12 |
125 | --enable-analyzer --enable-apparmor --enable-selinux | 126 | --prefix=/usr --enable-fatal-warnings --enable-analyzer |
127 | --enable-apparmor --enable-selinux | ||
126 | || (cat config.log; exit 1) | 128 | || (cat config.log; exit 1) |
127 | - name: make | 129 | - name: make |
128 | run: make -j "$(nproc)" | 130 | run: make -j "$(nproc)" |
@@ -160,8 +162,9 @@ jobs: | |||
160 | run: ./ci/printenv.sh | 162 | run: ./ci/printenv.sh |
161 | - name: configure | 163 | - name: configure |
162 | run: > | 164 | run: > |
163 | CC=gcc-12 ./configure --prefix=/usr --enable-fatal-warnings | 165 | ./configure CC=gcc-12 |
164 | --enable-analyzer --enable-apparmor --enable-selinux | 166 | --prefix=/usr --enable-fatal-warnings --enable-analyzer |
167 | --enable-apparmor --enable-selinux | ||
165 | || (cat config.log; exit 1) | 168 | || (cat config.log; exit 1) |
166 | - name: make | 169 | - name: make |
167 | run: make -j "$(nproc)" | 170 | run: make -j "$(nproc)" |
@@ -202,8 +205,9 @@ jobs: | |||
202 | run: ./ci/printenv.sh | 205 | run: ./ci/printenv.sh |
203 | - name: configure | 206 | - name: configure |
204 | run: > | 207 | run: > |
205 | CC=gcc-12 ./configure --prefix=/usr --enable-fatal-warnings | 208 | ./configure CC=gcc-12 |
206 | --enable-analyzer --enable-apparmor --enable-selinux | 209 | --prefix=/usr --enable-fatal-warnings --enable-analyzer |
210 | --enable-apparmor --enable-selinux | ||
207 | || (cat config.log; exit 1) | 211 | || (cat config.log; exit 1) |
208 | - name: make | 212 | - name: make |
209 | run: make -j "$(nproc)" | 213 | run: make -j "$(nproc)" |
@@ -248,8 +252,9 @@ jobs: | |||
248 | run: ./ci/printenv.sh | 252 | run: ./ci/printenv.sh |
249 | - name: configure | 253 | - name: configure |
250 | run: > | 254 | run: > |
251 | CC=gcc-12 ./configure --prefix=/usr --enable-fatal-warnings | 255 | ./configure CC=gcc-12 |
252 | --enable-analyzer --enable-apparmor --enable-selinux | 256 | --prefix=/usr --enable-fatal-warnings --enable-analyzer |
257 | --enable-apparmor --enable-selinux | ||
253 | || (cat config.log; exit 1) | 258 | || (cat config.log; exit 1) |
254 | - name: make | 259 | - name: make |
255 | run: make -j "$(nproc)" | 260 | run: make -j "$(nproc)" |