mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-10 07:10:06 +00:00
644d38570a
glibc has an add-ons mechanism to allow additional software to be integrated into the glibc build. Such add-ons may be within the glibc source tree, or outside it at a path passed to the --enable-add-ons configure option. localedata and crypt were once add-ons, distributed in separate release tarballs, but long since stopped using that mechanism. Linuxthreads was always an add-on. Ports spent some time as an add-on with separate release tarballs, then was first moved into the glibc source tree, then had its sysdeps files moved into the main sysdeps hierarchy so the add-ons mechanism was no longer used. NPTL spent some time as an add-on in the main glibc tree before stopping using the add-on mechanism. libidn used to have separate release tarballs but no longer does so, but still uses the add-ons mechanism within the glibc source tree. Various other software has supported building with the add-ons mechanism at times in the past, but I don't think any is still widely used. Add-ons involve significant, little-used complexity in the glibc build system, and make it hard to understand what the space of possible glibc configurations is. This patch removes the add-ons mechanism. libidn is now built via the Subdirs mechanism to cause any configuration using sysdeps/unix/inet to build libidn; HAVE_LIBIDN (which effectively means shared libraries are available) is now defined via sysdeps/unix/inet/configure. Various references to add-ons around the source tree are removed (in the case of maint.texi, the example list of sysdeps directories is still very out of date). Externally maintained ports should now put their files in the normal sysdeps directory structure rather than being arranged as add-ons; they probably need to change e.g. elf.h anyway, rather than actually being able to work just as a drop-in subtree. Hurd libpthread should be arranged similarly to NPTL, so some files might go in a hurd-pthreads (or similar) top-level directory in glibc, while sysdeps files should go in the normal sysdeps directory structure (possibly in hurd or hurd-pthreads subdirectories, just as there are nptl subdirectories in the sysdeps tree). Tested for x86_64, and with build-many-glibcs.py. * configure.ac (--enable-add-ons): Remove option. (machine): Do not mention add-ons in comment. (LIBC_PRECONFIGURE): Likewise. (add_ons): Remove variable and sanity checks and logic to locate add-ons. (add_ons_automatic): Remove variable. (configured_add_ons): Likewise. (add_ons_sfx): Likewise. (add_ons_pfx): Likewise. (add_on_subdirs): Likewise. (sysnames_add_ons): Likewise. Remove loop over add-ons and consideration of add-ons in Implies handling. (sysdeps_add_ons): Likewise. * configure: Regenerated. * libidn/configure.ac: Remove. * libidn/configure: Likewise. * sysdeps/unix/inet/configure.ac: New file. * sysdeps/unix/inet/configure: New generated file. * sysdeps/unix/inet/Subdirs: Add libidn. * Makeconfig (sysdeps-srcdirs): Remove variable. (+sysdep_dirs): Do not include $(sysdeps-srcdirs). ($(common-objpfx)config.status): Do not depend on add-on files. ($(common-objpfx)shlib-versions.v.i): Do not mention add-ons in comment. (all-subdirs): Do not include $(add-on-subdirs). * Makefile (dist-prepare): Do not use $(sysdeps-add-ons). * config.make.in (add-ons): Remove variable. (add-on-subdirs): Likewise. (sysdeps-add-ons): Likewise. * manual/Makefile (add-chapters): Remove. ($(objpfx)texis): Do not depend on $(add-chapters). (nonexamples): Do not handle $(add-chapters). (examples): Do not handle $(add-ons). (chapters.% top-menu.%): Do not pass '$(add-chapters)' to libc-texinfo.sh. * manual/install.texi (Installation): Do not mention add-ons. (--enable-add-ons): Do not document configure option. * INSTALL: Regenerated. * manual/libc-texinfo.sh: Do not handle $2 add-ons argument. * manual/maint.texi (Hierarchy Conventions): Do not mention add-ons. * scripts/build-many-glibcs.py (Glibc.build_glibc): Do not use --enable-add-ons. * scripts/gen-sorted.awk: Do not handle Subdirs files from add-ons. * scripts/test-installation.pl: Do not handle glibc-compat add-on. * sysdeps/nptl/Makeconfig: Do not mention add-ons in comment.
394 lines
12 KiB
Makefile
394 lines
12 KiB
Makefile
# Copyright (C) 1991-2017 Free Software Foundation, Inc.
|
||
# This file is part of the GNU C Library.
|
||
|
||
# The GNU C Library is free software; you can redistribute it and/or
|
||
# modify it under the terms of the GNU Lesser General Public
|
||
# License as published by the Free Software Foundation; either
|
||
# version 2.1 of the License, or (at your option) any later version.
|
||
|
||
# The GNU C Library 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
|
||
# Lesser General Public License for more details.
|
||
|
||
# You should have received a copy of the GNU Lesser General Public
|
||
# License along with the GNU C Library; if not, see
|
||
# <http://www.gnu.org/licenses/>.
|
||
|
||
#
|
||
# Master Makefile for the GNU C library
|
||
#
|
||
ifneq (,)
|
||
This makefile requires GNU Make.
|
||
endif
|
||
|
||
include Makeconfig
|
||
|
||
|
||
# This is the default target; it makes everything except the tests.
|
||
.PHONY: all
|
||
all: lib others
|
||
|
||
ifneq ($(AUTOCONF),no)
|
||
|
||
define autoconf-it
|
||
@-rm -f $@.new
|
||
$(AUTOCONF) $(ACFLAGS) $< > $@.new
|
||
chmod a-w$(patsubst %,$(comma)a+x,$(filter .,$(@D))) $@.new
|
||
mv -f $@.new $@
|
||
endef
|
||
|
||
configure: configure.ac aclocal.m4; $(autoconf-it)
|
||
%/configure: %/configure.ac aclocal.m4; $(autoconf-it)
|
||
%/preconfigure: %/preconfigure.ac aclocal.m4; $(autoconf-it)
|
||
|
||
endif # $(AUTOCONF) = no
|
||
|
||
|
||
# We don't want to run anything here in parallel.
|
||
.NOTPARALLEL:
|
||
|
||
# These are the targets that are made by making them in each subdirectory.
|
||
+subdir_targets := subdir_lib objects objs others subdir_mostlyclean \
|
||
subdir_clean subdir_distclean subdir_realclean \
|
||
tests xtests \
|
||
subdir_update-abi subdir_check-abi \
|
||
subdir_update-all-abi \
|
||
subdir_echo-headers \
|
||
subdir_install \
|
||
subdir_objs subdir_stubs subdir_testclean \
|
||
$(addprefix install-, no-libc.a bin lib data headers others)
|
||
|
||
headers := limits.h values.h features.h gnu-versions.h \
|
||
bits/xopen_lim.h gnu/libc-version.h stdc-predef.h \
|
||
bits/libc-header-start.h
|
||
|
||
echo-headers: subdir_echo-headers
|
||
|
||
# The headers are in the include directory.
|
||
subdir-dirs = include
|
||
vpath %.h $(subdir-dirs)
|
||
|
||
# What to install.
|
||
install-others = $(inst_includedir)/gnu/stubs.h
|
||
install-bin-script =
|
||
|
||
ifeq (yes,$(build-shared))
|
||
headers += gnu/lib-names.h
|
||
endif
|
||
|
||
include Makerules
|
||
|
||
ifeq ($(build-programs),yes)
|
||
others: $(addprefix $(objpfx),$(install-bin-script))
|
||
endif
|
||
|
||
# Install from subdirectories too.
|
||
install: subdir_install
|
||
|
||
# Explicit dependency so that `make install-headers' works
|
||
install-headers: install-headers-nosubdir
|
||
|
||
# Make sure that the dynamic linker is installed before libc.
|
||
$(inst_slibdir)/libc-$(version).so: elf/ldso_install
|
||
|
||
.PHONY: elf/ldso_install
|
||
elf/ldso_install:
|
||
$(MAKE) -C $(@D) $(@F)
|
||
|
||
# Create links for shared libraries using the `ldconfig' program if possible.
|
||
# Ignore the error if we cannot update /etc/ld.so.cache.
|
||
ifeq (no,$(cross-compiling))
|
||
ifeq (yes,$(build-shared))
|
||
install: install-symbolic-link
|
||
.PHONY: install-symbolic-link
|
||
install-symbolic-link: subdir_install
|
||
$(symbolic-link-prog) $(symbolic-link-list)
|
||
rm -f $(symbolic-link-list)
|
||
|
||
install:
|
||
-test ! -x $(elf-objpfx)ldconfig || LC_ALL=C \
|
||
$(elf-objpfx)ldconfig $(addprefix -r ,$(install_root)) \
|
||
$(slibdir) $(libdir)
|
||
ifneq (no,$(PERL))
|
||
ifeq (/usr,$(prefix))
|
||
ifeq (,$(install_root))
|
||
LD_SO=$(ld.so-version) CC="$(CC)" $(PERL) scripts/test-installation.pl $(common-objpfx)
|
||
endif
|
||
endif
|
||
endif
|
||
endif
|
||
endif
|
||
|
||
# Build subdirectory lib objects.
|
||
lib-noranlib: subdir_lib
|
||
|
||
ifeq (yes,$(build-shared))
|
||
# Build the shared object from the PIC object library.
|
||
lib: $(common-objpfx)libc.so $(common-objpfx)linkobj/libc.so
|
||
endif # $(build-shared)
|
||
|
||
|
||
# This is a handy script for running any dynamically linked program against
|
||
# the current libc build for testing.
|
||
$(common-objpfx)testrun.sh: $(common-objpfx)config.make \
|
||
$(..)Makeconfig $(..)Makefile
|
||
(echo '#!/bin/sh'; \
|
||
echo 'builddir=`dirname "$$0"`'; \
|
||
echo 'GCONV_PATH="$${builddir}/iconvdata" \'; \
|
||
echo 'exec $(subst $(common-objdir),"$${builddir}",\
|
||
$(test-program-prefix)) $${1+"$$@"}'; \
|
||
) > $@T
|
||
chmod a+x $@T
|
||
mv -f $@T $@
|
||
postclean-generated += testrun.sh
|
||
|
||
others: $(common-objpfx)testrun.sh
|
||
|
||
# Makerules creates a file `stubs' in each subdirectory, which
|
||
# contains `#define __stub_FUNCTION' for each function defined in that
|
||
# directory which is a stub.
|
||
# Here we paste all of these together into <gnu/stubs.h>.
|
||
|
||
subdir-stubs := $(foreach dir,$(subdirs),$(common-objpfx)$(dir)/stubs)
|
||
|
||
ifndef abi-variants
|
||
installed-stubs = $(inst_includedir)/gnu/stubs.h
|
||
else
|
||
installed-stubs = $(inst_includedir)/gnu/stubs-$(default-abi).h
|
||
|
||
$(inst_includedir)/gnu/stubs.h: $(+force)
|
||
$(make-target-directory)
|
||
{ \
|
||
echo '/* This file is automatically generated.';\
|
||
echo " This file selects the right generated file of \`__stub_FUNCTION' macros";\
|
||
echo ' based on the architecture being compiled for. */'; \
|
||
echo ''; \
|
||
$(foreach h,$(abi-includes), echo '#include <$(h)>';) \
|
||
echo ''; \
|
||
$(foreach v,$(abi-variants),\
|
||
$(if $(abi-$(v)-condition),\
|
||
echo '#if $(abi-$(v)-condition)'; \
|
||
echo '# include <gnu/stubs-$(v).h>'); \
|
||
$(if $(abi-$(v)-condition),echo '#endif';) \
|
||
rm -f $(@:.d=.h).new$(v); \
|
||
) \
|
||
} > $(@:.d=.h).new
|
||
mv -f $(@:.d=.h).new $(@:.d=.h)
|
||
|
||
install-others-nosubdir: $(installed-stubs)
|
||
endif
|
||
|
||
|
||
# Since stubs.h is never needed when building the library, we simplify the
|
||
# hairy installation process by producing it in place only as the last part
|
||
# of the top-level `make install'. It depends on subdir_install, which
|
||
# iterates over all the subdirs; subdir_install in each subdir depends on
|
||
# the subdir's stubs file. Having more direct dependencies would result in
|
||
# extra iterations over the list for subdirs and many recursive makes.
|
||
$(installed-stubs): include/stubs-prologue.h subdir_install
|
||
$(make-target-directory)
|
||
@rm -f $(objpfx)stubs.h
|
||
(sed '/^@/d' $<; LC_ALL=C sort $(subdir-stubs)) > $(objpfx)stubs.h
|
||
if test -r $@ && cmp -s $(objpfx)stubs.h $@; \
|
||
then echo 'stubs.h unchanged'; \
|
||
else $(INSTALL_DATA) $(objpfx)stubs.h $@; fi
|
||
rm -f $(objpfx)stubs.h
|
||
|
||
# This makes the Info or DVI file of the documentation from the Texinfo source.
|
||
.PHONY: info dvi pdf html
|
||
info dvi pdf html:
|
||
$(MAKE) $(PARALLELMFLAGS) -C manual $@
|
||
|
||
# This makes all the subdirectory targets.
|
||
|
||
# For each target, make it depend on DIR/target for each subdirectory DIR.
|
||
$(+subdir_targets): %: $(addsuffix /%,$(subdirs))
|
||
|
||
# Compute a list of all those targets.
|
||
all-subdirs-targets := $(foreach dir,$(subdirs),\
|
||
$(addprefix $(dir)/,$(+subdir_targets)))
|
||
|
||
# The action for each of those is to cd into the directory and make the
|
||
# target there.
|
||
$(all-subdirs-targets):
|
||
$(MAKE) $(PARALLELMFLAGS) $(subdir-target-args) $(@F)
|
||
|
||
define subdir-target-args
|
||
subdir=$(@D)$(if $($(@D)-srcdir),\
|
||
-C $($(@D)-srcdir) ..=`pwd`/,\
|
||
-C $(@D) ..=../)
|
||
endef
|
||
|
||
.PHONY: $(+subdir_targets) $(all-subdirs-targets)
|
||
|
||
# Targets to clean things up to various degrees.
|
||
|
||
.PHONY: clean realclean distclean distclean-1 parent-clean parent-mostlyclean \
|
||
tests-clean
|
||
|
||
# Subroutines of all cleaning targets.
|
||
parent-mostlyclean: common-mostlyclean # common-mostlyclean is in Makerules.
|
||
-rm -f $(foreach o,$(object-suffixes-for-libc),\
|
||
$(common-objpfx)$(patsubst %,$(libtype$o),c)) \
|
||
$(addprefix $(objpfx),$(install-lib))
|
||
parent-clean: parent-mostlyclean common-clean
|
||
|
||
postclean = $(addprefix $(common-objpfx),$(postclean-generated)) \
|
||
$(addprefix $(objpfx),sysd-dirs sysd-rules) \
|
||
$(addprefix $(objpfx),sysd-sorted soversions.mk soversions.i)
|
||
|
||
clean: parent-clean
|
||
# This is done this way rather than having `subdir_clean' be a
|
||
# dependency of this target so that libc.a will be removed before the
|
||
# subdirectories are dealt with and so they won't try to remove object
|
||
# files from it when it's going to be removed anyway.
|
||
@$(MAKE) subdir_clean no_deps=t
|
||
-rm -f $(postclean)
|
||
mostlyclean: parent-mostlyclean
|
||
@$(MAKE) subdir_mostlyclean no_deps=t
|
||
-rm -f $(postclean)
|
||
|
||
tests-clean:
|
||
@$(MAKE) subdir_testclean no_deps=t
|
||
|
||
ifneq (,$(CXX))
|
||
vpath c++-types.data $(+sysdep_dirs)
|
||
|
||
tests-special += $(objpfx)c++-types-check.out
|
||
$(objpfx)c++-types-check.out: c++-types.data scripts/check-c++-types.sh
|
||
scripts/check-c++-types.sh $< $(CXX) $(filter-out -std=gnu11 $(+gccwarn-c),$(CFLAGS)) $(CPPFLAGS) > $@; \
|
||
$(evaluate-test)
|
||
endif
|
||
|
||
tests-special += $(objpfx)check-local-headers.out
|
||
$(objpfx)check-local-headers.out: scripts/check-local-headers.sh
|
||
AWK='$(AWK)' scripts/check-local-headers.sh \
|
||
"$(includedir)" "$(objpfx)" < /dev/null > $@; \
|
||
$(evaluate-test)
|
||
|
||
ifneq "$(headers)" ""
|
||
# Special test of all the installed headers in this directory.
|
||
tests-special += $(objpfx)check-installed-headers-c.out
|
||
libof-check-installed-headers-c := testsuite
|
||
$(objpfx)check-installed-headers-c.out: \
|
||
scripts/check-installed-headers.sh $(headers)
|
||
$(SHELL) $(..)scripts/check-installed-headers.sh c \
|
||
"$(CC) $(filter-out -std=%,$(CFLAGS)) -D_ISOMAC $(+includes)" \
|
||
$(headers) > $@; \
|
||
$(evaluate-test)
|
||
|
||
ifneq "$(CXX)" ""
|
||
tests-special += $(objpfx)check-installed-headers-cxx.out
|
||
libof-check-installed-headers-cxx := testsuite
|
||
$(objpfx)check-installed-headers-cxx.out: \
|
||
scripts/check-installed-headers.sh $(headers)
|
||
$(SHELL) $(..)scripts/check-installed-headers.sh c++ \
|
||
"$(CXX) $(filter-out -std=%,$(CXXFLAGS)) -D_ISOMAC $(+includes)" \
|
||
$(headers) > $@; \
|
||
$(evaluate-test)
|
||
endif
|
||
endif
|
||
|
||
define summarize-tests
|
||
@egrep -v '^(PASS|XFAIL):' $(objpfx)$1 || true
|
||
@echo "Summary of test results$2:"
|
||
@sed 's/:.*//' < $(objpfx)$1 | sort | uniq -c
|
||
@! egrep -q -v '^(X?PASS|XFAIL|UNSUPPORTED):' $(objpfx)$1
|
||
endef
|
||
|
||
tests-special-notdir = $(patsubst $(objpfx)%, %, $(tests-special))
|
||
tests: $(tests-special)
|
||
$(..)scripts/merge-test-results.sh -s $(objpfx) "" \
|
||
$(sort $(tests-special-notdir:.out=)) \
|
||
> $(objpfx)subdir-tests.sum
|
||
$(..)scripts/merge-test-results.sh -t $(objpfx) subdir-tests.sum \
|
||
$(sort $(subdirs) .) \
|
||
> $(objpfx)tests.sum
|
||
$(call summarize-tests,tests.sum)
|
||
xtests:
|
||
$(..)scripts/merge-test-results.sh -t $(objpfx) subdir-xtests.sum \
|
||
$(sort $(subdirs)) \
|
||
> $(objpfx)xtests.sum
|
||
$(call summarize-tests,xtests.sum, for extra tests)
|
||
|
||
# The realclean target is just like distclean for the parent, but we want
|
||
# the subdirs to know the difference in case they care.
|
||
realclean distclean: parent-clean
|
||
# This is done this way rather than having `subdir_distclean' be a
|
||
# dependency of this target so that libc.a will be removed before the
|
||
# subdirectories are dealt with and so they won't try to remove object
|
||
# files from it when it's going to be removed anyway.
|
||
@$(MAKE) distclean-1 no_deps=t distclean-1=$@ avoid-generated=yes \
|
||
sysdep-subdirs="$(sysdep-subdirs)"
|
||
-rm -f $(postclean)
|
||
|
||
# Subroutine of distclean and realclean.
|
||
distclean-1: subdir_$(distclean-1)
|
||
-rm -f $(config-generated)
|
||
-rm -f $(addprefix $(objpfx),config.status config.cache config.log)
|
||
-rm -f $(addprefix $(objpfx),config.make config-name.h config.h)
|
||
ifdef objdir
|
||
-rm -f $(objpfx)Makefile
|
||
endif
|
||
-rm -f $(sysdep-$(distclean-1))
|
||
|
||
# Make the TAGS file for Emacs users.
|
||
|
||
.PHONY: TAGS
|
||
TAGS:
|
||
scripts/list-sources.sh | sed -n -e '/Makefile/p' \
|
||
$(foreach S,[chsSyl] cxx sh bash pl,\
|
||
$(subst .,\.,-e '/.$S\(.in\)*$$/p')) \
|
||
| $(ETAGS) -o $@ -
|
||
|
||
# Make the distribution tarfile.
|
||
.PHONY: dist dist-prepare
|
||
|
||
generated := $(generated) stubs.h
|
||
|
||
files-for-dist := README INSTALL configure ChangeLog NEWS
|
||
|
||
# Regenerate stuff, then error if these things are not committed yet.
|
||
dist-prepare: $(files-for-dist)
|
||
conf=`find sysdeps -name configure`; \
|
||
$(MAKE) $$conf && \
|
||
git diff --stat HEAD -- $^ $$conf \
|
||
| $(AWK) '{ print; rc=1 } END { exit rc }'
|
||
|
||
%.tar: FORCE
|
||
git archive --prefix=$*/ $* > $@.new
|
||
mv -f $@.new $@
|
||
|
||
# Do `make dist dist-version=X.Y.Z' to make tar files of an older version.
|
||
|
||
ifneq (,$(strip $(dist-version)))
|
||
dist: $(foreach Z,.bz2 .gz .xz,$(dist-version).tar$Z)
|
||
md5sum $^
|
||
else
|
||
dist: dist-prepare
|
||
@if v=`git describe`; then \
|
||
echo Distribution version $$v; \
|
||
$(MAKE) dist dist-version=$$v; \
|
||
else \
|
||
false; \
|
||
fi
|
||
endif
|
||
|
||
INSTALL: manual/install-plain.texi manual/macros.texi \
|
||
$(common-objpfx)manual/pkgvers.texi manual/install.texi
|
||
makeinfo --no-validate --plaintext --no-number-sections \
|
||
-I$(common-objpfx)manual $< -o $@-tmp
|
||
$(AWK) 'NF == 0 { ++n; next } \
|
||
NF != 0 { while (n-- > 0) print ""; n = 0; print }' \
|
||
< $@-tmp > $@-tmp2
|
||
rm -f $@-tmp
|
||
-chmod a-w $@-tmp2
|
||
mv -f $@-tmp2 $@
|
||
$(common-objpfx)manual/%: FORCE
|
||
$(MAKE) $(PARALLELMFLAGS) -C manual $@
|
||
FORCE:
|
||
|
||
iconvdata/% localedata/% po/%: FORCE
|
||
$(MAKE) $(PARALLELMFLAGS) -C $(@D) $(@F)
|