Skip to content

Commit 38e538b

Browse files
authored
Merge branch 'main' into patch-1
2 parents 52d1997 + 8fc9d28 commit 38e538b

File tree

4 files changed

+23
-12
lines changed

4 files changed

+23
-12
lines changed

.github/workflows/CICD.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -303,11 +303,14 @@ jobs:
303303
run: make nextest PROFILE=ci CARGOFLAGS="--hide-progress-bar"
304304
env:
305305
RUST_BACKTRACE: "1"
306-
- name: "`make install COMPLETIONS=n MANPAGES=n LOCALES=n`"
306+
307+
- name: "`make install PROFILE=release-fast COMPLETIONS=n MANPAGES=n LOCALES=n`"
307308
shell: bash
308309
run: |
309310
set -x
310-
DESTDIR=/tmp/ make PROFILE=release COMPLETIONS=n MANPAGES=n LOCALES=n install
311+
DESTDIR=/tmp/ make PROFILE=release-fast COMPLETIONS=n MANPAGES=n LOCALES=n install
312+
# Check that utils are built with given profile
313+
./target/release-fast/true
311314
# Check that the utils are present
312315
test -f /tmp/usr/local/bin/tty
313316
# Check that the manpage is not present
@@ -1199,6 +1202,7 @@ jobs:
11991202
- name: build and test all features individually
12001203
shell: bash
12011204
run: |
1205+
command -v sudo && sudo rm -rf /usr/share/dotnet # avoid no space left
12021206
CARGO_FEATURES_OPTION='--features=${{ matrix.job.features }}' ;
12031207
for f in $(util/show-utils.sh ${CARGO_FEATURES_OPTION})
12041208
do

GNUmakefile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
# spell-checker:ignore (misc) testsuite runtest findstring (targets) busytest toybox distclean pkgs nextest ; (vars/env) BINDIR BUILDDIR CARGOFLAGS DESTDIR DOCSDIR INSTALLDIR INSTALLEES MULTICALL DATAROOTDIR TESTDIR manpages
22

33
# Config options
4+
ifneq (,$(filter install, $(MAKECMDGOALS)))
5+
PROFILE?=release
6+
endif
47
PROFILE ?= debug
58
MULTICALL ?= n
69
COMPLETIONS ?= y
710
MANPAGES ?= y
811
LOCALES ?= y
912
INSTALL ?= install
10-
ifneq (,$(filter install, $(MAKECMDGOALS)))
11-
override PROFILE:=release
12-
endif
1313

1414
# Needed for the foreach loops to split each loop into a separate command
1515
define newline
1616

1717

1818
endef
1919

20-
PROFILE_CMD :=
21-
ifeq ($(PROFILE),release)
22-
PROFILE_CMD = --release
20+
PROFILE_CMD := --profile=${PROFILE}
21+
ifeq ($(PROFILE),debug)
22+
PROFILE_CMD =
2323
endif
2424

2525
# Binaries

README.md

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,16 +152,16 @@ cargo build -p uu_base32 -p uu_cat -p uu_echo -p uu_rm
152152

153153
Building using `make` is a simple process as well.
154154

155-
To simply build all available utilities:
155+
To simply build all available utilities (with debug profile):
156156

157157
```shell
158158
make
159159
```
160160

161-
In release mode:
161+
In release-fast mode:
162162

163163
```shell
164-
make PROFILE=release
164+
make PROFILE=release-fast
165165
```
166166

167167
To build all but a few of the available utilities:
@@ -201,6 +201,12 @@ To install all available utilities:
201201
make install
202202
```
203203

204+
To install all utilities with all possible optimizations:
205+
206+
```shell
207+
make PROFILE=release-fast install
208+
```
209+
204210
To install using `sudo` switch `-E` must be used:
205211

206212
```shell

util/build-gnu.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,8 @@ else
140140
# Change the PATH to test the uutils coreutils instead of the GNU coreutils
141141
sed -i "s/^[[:blank:]]*PATH=.*/ PATH='${UU_BUILD_DIR//\//\\/}\$(PATH_SEPARATOR)'\"\$\$PATH\" \\\/" tests/local.mk
142142
./bootstrap --skip-po
143-
./configure --quiet --disable-gcc-warnings --disable-nls --disable-dependency-tracking --disable-bold-man-page-references
143+
./configure --quiet --disable-gcc-warnings --disable-nls --disable-dependency-tracking --disable-bold-man-page-references \
144+
"$([ ${SELINUX_ENABLED} = 1 ] && echo --with-selinux || echo --without-selinux)"
144145
#Add timeout to to protect against hangs
145146
sed -i 's|^"\$@|'"${SYSTEM_TIMEOUT}"' 600 "\$@|' build-aux/test-driver
146147
sed -i 's| tr | /usr/bin/tr |' tests/init.sh

0 commit comments

Comments
 (0)