mirror of
git://git.sv.gnu.org/coreutils.git
synced 2026-02-16 20:33:18 +02:00
71e2ea7734
Add the --enable-single-binary option to the configure file.
When enabled, this option builds a single binary file containing
the selected tools. Which tool gets executed depends on the value
of argv[0] which can be set implicitly through symlinks to the
single program.
This setup reduces significantly the size of a complete coreutils
install, since code from lib/libcoreutils.a is not duplicated in
every one of the more than 100 binaries. Runtime overhead is
increased due to more dynamic libraries being loaded, and extra
initialization being performed for all utils. Also initially
a larger binary is loaded from storage, though this is usually
alleviated due to caching and lazy mmaping of unused blocks,
and in fact the single binary should have better caching
characteristics.
Comparing the size of the individual versus single binary on x86_64:
$ cd src
$ size coreutils
$ size -t $(../build-aux/gen-lists-of-programs.sh --list-progs |
grep -Ev '(coreutils|libstdbuf)') | tail -n1
text data bss dec hex filename
1097416 5388 88432 1191236 122d44 src/coreutils
4901010 124964 163768 5189742 4f306e (TOTALS)
Storage requirements are reduced similarly:
$ cd src
$ du -h coreutils
$ du -ch $(../build-aux/gen-lists-of-programs.sh --list-progs |
grep -Ev '(coreutils|libstdbuf)') | tail -n1
1.2M coreutils
5.3M total
When installing, the makefile will create either symlinks or
shebangs based on the --enable-single-binary setting, for
each configured tool. In this way, all the tools are still
callable individually, but they are all implemented by the same
"coreutils" binary installed on the same directory.
* .gitignore: Add new generated files.
* Makefile.am: New rules to generate build-aux/gen-single-binary.sh
and install symlinks.
* NEWS: Mention the new feature.
* README: Add "coreutils" to the list of utils.
* bootstrap.conf: Regenerate src/single-binary.mk
* build-aux/gen-lists-of-programs.sh: New --list-progs option.
* build-aux/gen-single-binary.sh: Regenerate
* configure.ac: New --enable-single-binary option and other variables.
Disallow --enable-single-binary=symlinks with --program-prefix et. al.
* man/coreutils.x: Manpage hook.
* man/local.mk: Add manpage hook and fix dependencies.
* src/coreutils.c: Multicall implementation.
* src/local.mk: New rules for the single binary option.
* tests/local.mk: Add $single_binary_progs to support
require_built_() from init.cfg
* tests/misc/env.sh: Avoid the use of symlink to echo.
* tests/misc/help-version.sh: Add exception for coreutils.
* tests/install/basic-1.sh: Really avoid using ginstall strip
functionality if there is an issue with the independent strip command.
* src/kill.c: Changes to call exit() in main.
* src/readlink.c: Likewise.
* src/shuf.c: Likewise.
* src/timeout.c: Likewise.
* src/truncate.c: Likewise.
219 lines
7.4 KiB
Makefile
219 lines
7.4 KiB
Makefile
# Make coreutils. -*-Makefile-*-
|
|
|
|
# Copyright (C) 1990-2014 Free Software Foundation, Inc.
|
|
|
|
# This program is free software: you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation, either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
ALL_RECURSIVE_TARGETS =
|
|
|
|
SUBDIRS = po . gnulib-tests
|
|
|
|
changelog_etc = \
|
|
ChangeLog-2005 \
|
|
ChangeLog-2006 \
|
|
ChangeLog-2007 \
|
|
ChangeLog-2008 \
|
|
build-aux/ChangeLog-2007 \
|
|
doc/ChangeLog-2007 \
|
|
lib/ChangeLog-2007 \
|
|
m4/ChangeLog-2007 \
|
|
old/fileutils/ChangeLog \
|
|
old/fileutils/ChangeLog-1997 \
|
|
old/fileutils/NEWS \
|
|
old/sh-utils/ChangeLog \
|
|
old/sh-utils/ChangeLog.0 \
|
|
old/sh-utils/NEWS \
|
|
old/textutils/ChangeLog \
|
|
old/textutils/NEWS \
|
|
po/ChangeLog-2007
|
|
|
|
EXTRA_DIST = \
|
|
$(changelog_etc) \
|
|
.mailmap \
|
|
.prev-version \
|
|
.version \
|
|
.vg-suppressions \
|
|
THANKS.in \
|
|
THANKS-to-translators \
|
|
THANKStt.in \
|
|
bootstrap \
|
|
bootstrap.conf \
|
|
build-aux/gen-lists-of-programs.sh \
|
|
build-aux/gen-single-binary.sh \
|
|
cfg.mk \
|
|
dist-check.mk \
|
|
maint.mk \
|
|
tests/GNUmakefile \
|
|
thanks-gen
|
|
|
|
gen_progs_lists = $(top_srcdir)/build-aux/gen-lists-of-programs.sh
|
|
gen_single_binary = $(top_srcdir)/build-aux/gen-single-binary.sh
|
|
|
|
# Keep these in sync with bootstrap.conf:bootstrap_post_import_hook().
|
|
# Use '$(top_srcdir)/m4' and '$(srcdir)/src' for the benefit of non-GNU
|
|
# makes: it is with those directories that 'cu-progs.m4' and 'cu-progs.mk'
|
|
# appear in our dependencies.
|
|
$(top_srcdir)/m4/cu-progs.m4: $(gen_progs_lists)
|
|
$(AM_V_GEN)rm -f $@ $@-t \
|
|
&& $(SHELL) $(gen_progs_lists) --autoconf >$@-t \
|
|
&& chmod a-w $@-t && mv -f $@-t $@
|
|
$(srcdir)/src/cu-progs.mk: $(gen_progs_lists)
|
|
$(AM_V_GEN)rm -f $@ $@-t \
|
|
&& $(SHELL) $(gen_progs_lists) --automake >$@-t \
|
|
&& chmod a-w $@-t && mv -f $@-t $@
|
|
$(srcdir)/src/single-binary.mk: $(gen_single_binary) $(srcdir)/src/local.mk
|
|
$(AM_V_GEN)rm -f $@ $@-t \
|
|
&& $(SHELL) $(gen_single_binary) $(srcdir)/src/local.mk >$@-t \
|
|
&& chmod a-w $@-t && mv -f $@-t $@
|
|
|
|
ACLOCAL_AMFLAGS = -I m4
|
|
|
|
# Shortcut targets to make it easier to run (very) expensive tests.
|
|
check-expensive:
|
|
$(MAKE) check RUN_EXPENSIVE_TESTS=yes
|
|
check-very-expensive:
|
|
$(MAKE) check-expensive RUN_VERY_EXPENSIVE_TESTS=yes
|
|
|
|
# Just prior to distribution, ...
|
|
# transform the automake-generated rule that runs 'rm -f rm'.
|
|
# On some systems, that command would fail with a diagnostic like
|
|
# "rm: cannot unlink 'rm': Text file busy" when '.' appears so early
|
|
# in the shell's search path that running 'rm' would run the 'rm'
|
|
# executable in the current directory.
|
|
# Similarly, adjust the clean-binPROGRAMS rule.
|
|
rm_subst = \
|
|
s!(rm -f (rm\b|\$$\(bin_PROGRAMS\)$$))!$$1 > /dev/null 2>&1 || /bin/$$1!
|
|
|
|
BUILT_SOURCES = .version
|
|
.version:
|
|
$(AM_V_GEN)echo $(VERSION) > $@-t && mv $@-t $@
|
|
|
|
# Arrange so that .tarball-version appears only in the distribution
|
|
# tarball, and never in a checked-out repository.
|
|
# The perl substitution is to change some key uses of "rm" to "/bin/rm".
|
|
# See the rm_subst comment for details.
|
|
dist-hook: gen-ChangeLog
|
|
$(AM_V_GEN)echo $(VERSION) > $(distdir)/.tarball-version
|
|
$(AM_V_at)perl -pi -e '$(rm_subst)' $(distdir)/Makefile.in
|
|
|
|
gen_start_date = 2008-02-08
|
|
.PHONY: gen-ChangeLog
|
|
gen-ChangeLog:
|
|
$(AM_V_GEN)if test -d .git; then \
|
|
log_fix="$(srcdir)/build-aux/git-log-fix"; \
|
|
test -e "$$log_fix" \
|
|
&& amend_git_log="--amend=$$log_fix" \
|
|
|| amend_git_log=; \
|
|
$(top_srcdir)/build-aux/gitlog-to-changelog \
|
|
$$amend_git_log --since=$(gen_start_date) > $(distdir)/cl-t && \
|
|
{ rm -f $(distdir)/ChangeLog && \
|
|
mv $(distdir)/cl-t $(distdir)/ChangeLog; } \
|
|
fi
|
|
|
|
ALL_RECURSIVE_TARGETS += distcheck-hook
|
|
distcheck-hook: check-ls-dircolors
|
|
$(MAKE) my-distcheck
|
|
$(MAKE) taint-distcheck
|
|
|
|
DISTCLEANFILES = VERSION
|
|
MAINTAINERCLEANFILES = THANKS-to-translators
|
|
THANKS-to-translators: po/LINGUAS THANKStt.in
|
|
$(AM_V_GEN)( \
|
|
cat $(srcdir)/THANKStt.in; \
|
|
for lang in `cat $(srcdir)/po/LINGUAS`; do \
|
|
echo http://translationproject.org/team/$$lang.html; \
|
|
done; \
|
|
) > $@-tmp && mv $@-tmp $@
|
|
|
|
# Ensure that the sets of two-letter codes in ls.c and dircolors.c
|
|
# remain in sync.
|
|
.PHONY: check-ls-dircolors
|
|
check-ls-dircolors:
|
|
$(AM_V_GEN)dc=$$(sed -n '/static.*ls_codes\[/,/};'/p \
|
|
$(srcdir)/src/dircolors.c \
|
|
|sed -n '/^ *"/p'|tr , '\n'|sed 's/^ *//' \
|
|
|sed -n 's/^"\(..\)"/\1/p'|sort -u); \
|
|
ls=$$(sed -n '/static.*indicator_name\[/,/};'/\p \
|
|
$(srcdir)/src/ls.c \
|
|
|sed -n '/^ *"/p'|tr , '\n'|sed 's/^ *//' \
|
|
|sed -n 's/^"\(..\)"/\1/p'|sort -u); \
|
|
test "$$dc" = "$$ls"
|
|
|
|
# Sort in traditional ASCII order, regardless of the current locale;
|
|
# otherwise we may get into trouble with distinct strings that the
|
|
# current locale considers to be equal.
|
|
ASSORT = LC_ALL=C sort
|
|
|
|
# Extract all lines up to the first one starting with "##".
|
|
prologue = perl -ne '/^\#\#/ and exit; print' $(srcdir)/THANKS.in
|
|
|
|
THANKS: THANKS.in Makefile.am .mailmap thanks-gen .version
|
|
$(AM_V_GEN)rm -f $@-t $@; \
|
|
{ \
|
|
$(prologue); echo; \
|
|
{ perl -ne '/^$$/.../^$$/ and print' $(srcdir)/THANKS.in \
|
|
| grep -v '^$$' | perl -pe 's/ +/\0/'; \
|
|
git log --pretty=format:'%aN%x00%aE' \
|
|
| $(ASSORT) -u; \
|
|
} | $(srcdir)/thanks-gen \
|
|
| LC_ALL=en_US.UTF-8 sort -f; \
|
|
echo; \
|
|
printf ';; %s\n' 'Local Variables:' 'coding: utf-8' End:; \
|
|
} > $@-t && chmod a-w $@-t && mv $@-t $@
|
|
|
|
# Some of our git hook scripts are supposed to be identical to git's samples.
|
|
# See if they are still in sync.
|
|
.PHONY: check-git-hook-script-sync
|
|
check-git-hook-script-sync:
|
|
@fail=0; \
|
|
t=$$(mktemp -d) \
|
|
&& cd $$t && git init -q && cd .git/hooks \
|
|
&& for i in pre-commit pre-applypatch applypatch-msg; do \
|
|
diff $(abs_top_srcdir)/scripts/git-hooks/$$i $$i.sample \
|
|
|| fail=1; \
|
|
done; \
|
|
rm -rf $$t; \
|
|
test $$fail = 0
|
|
|
|
# If we are building a single-binary, create symlinks or shebangs for
|
|
# the selected tools when installing.
|
|
install-exec-hook:
|
|
$(AM_V_at)ctrans=$$(printf coreutils | sed -e "$(transform)"); \
|
|
for p in $(single_binary_progs); do \
|
|
ptrans=$$(printf '%s' "$$p" | sed -e "$(transform)"); \
|
|
rm -f $(DESTDIR)$(bindir)/$$ptrans$(EXEEXT) || exit $$?; \
|
|
if test "x$(single_binary_install_type)" = xshebangs; then \
|
|
printf '#!%s --coreutils-prog-shebang=%s\n' \
|
|
$(bindir)/$$ctrans$(EXEEXT) $$p \
|
|
>$(DESTDIR)$(bindir)/$$ptrans$(EXEEXT) || exit $$?; \
|
|
chmod a+x,a-w $(DESTDIR)$(bindir)/$$ptrans$(EXEEXT) || exit $$?;\
|
|
else \
|
|
$(LN_S) -s $$ctrans$(EXEEXT) \
|
|
$(DESTDIR)$(bindir)/$$ptrans$(EXEEXT) || exit $$?; \
|
|
fi \
|
|
done
|
|
|
|
noinst_LIBRARIES =
|
|
MOSTLYCLEANFILES =
|
|
CLEANFILES =
|
|
MOSTLYCLEANDIRS =
|
|
|
|
AM_CPPFLAGS = -Ilib -I$(top_srcdir)/lib -Isrc -I$(top_srcdir)/src
|
|
|
|
include $(top_srcdir)/lib/local.mk
|
|
include $(top_srcdir)/src/local.mk
|
|
include $(top_srcdir)/doc/local.mk
|
|
include $(top_srcdir)/man/local.mk
|
|
include $(top_srcdir)/tests/local.mk
|