mirror of
git://sourceware.org/git/glibc.git
synced 2024-12-09 04:11:27 +08: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.
193 lines
6.7 KiB
Makefile
193 lines
6.7 KiB
Makefile
# Copyright (C) 1992-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/>.
|
|
|
|
# Makefile for the GNU C Library manual.
|
|
|
|
subdir := manual
|
|
|
|
include ../Makeconfig
|
|
|
|
.PHONY: dvi pdf info html
|
|
|
|
dvi: $(objpfx)libc.dvi
|
|
pdf: $(objpfx)libc.pdf
|
|
|
|
TEXI2DVI = texi2dvi
|
|
TEXI2PDF = texi2dvi --pdf
|
|
|
|
ifneq ($(strip $(MAKEINFO)),:)
|
|
info: $(objpfx)libc.info
|
|
endif
|
|
|
|
chapters = $(addsuffix .texi, \
|
|
intro errno memory ctype string charset locale \
|
|
message search pattern io stdio llio filesys \
|
|
pipe socket terminal syslog math arith time \
|
|
resource setjmp signal startup process ipc job \
|
|
nss users sysinfo conf crypt debug threads \
|
|
probes tunables)
|
|
appendices = lang.texi header.texi install.texi maint.texi platform.texi \
|
|
contrib.texi
|
|
licenses = freemanuals.texi lgpl-2.1.texi fdl-1.3.texi
|
|
|
|
-include $(objpfx)texis
|
|
$(objpfx)texis: texis.awk $(chapters) $(appendices) $(licenses)
|
|
$(make-target-directory)
|
|
$(AWK) -f $^ > $@.T
|
|
mv -f $@.T $@
|
|
|
|
nonexamples = $(filter-out %.c.texi, $(texis))
|
|
examples = $(filter %.c.texi, $(texis))
|
|
|
|
# Generated files directly included from libc.texinfo.
|
|
libc-texi-generated = chapters.texi top-menu.texi dir-add.texi \
|
|
libm-err.texi version.texi pkgvers.texi
|
|
|
|
# Add path to build dir for generated files
|
|
texis-path := $(filter-out $(libc-texi-generated) summary.texi $(examples), \
|
|
$(texis)) \
|
|
$(addprefix $(objpfx),$(filter $(libc-texi-generated) summary.texi \
|
|
$(examples), $(texis)))
|
|
|
|
# Kludge: implicit rule so Make knows the one command does it all.
|
|
chapters.% top-menu.%: libc-texinfo.sh $(texis-path) Makefile
|
|
AWK=$(AWK) $(SHELL) $< $(objpfx) \
|
|
'$(chapters)' \
|
|
'$(appendices) $(licenses)'
|
|
|
|
|
|
$(objpfx)libc.dvi $(objpfx)libc.pdf $(objpfx)libc.info: \
|
|
$(addprefix $(objpfx),$(libc-texi-generated))
|
|
$(objpfx)libc.dvi $(objpfx)libc.pdf: texinfo.tex
|
|
|
|
html: $(objpfx)libc/index.html
|
|
$(objpfx)libc/index.html: $(addprefix $(objpfx),$(libc-texi-generated))
|
|
$(MAKEINFO) -P $(objpfx) -o $(objpfx)libc --html libc.texinfo
|
|
|
|
# Generate the summary from the Texinfo source files for each chapter.
|
|
$(objpfx)summary.texi: $(objpfx)stamp-summary ;
|
|
$(objpfx)stamp-summary: summary.pl $(filter-out $(objpfx)summary.texi, \
|
|
$(texis-path))
|
|
$(SHELL) ./check-safety.sh $(filter-out $(objpfx)%, $(texis-path))
|
|
LC_ALL=C $(PERL) $^ > $(objpfx)summary-tmp
|
|
$(move-if-change) $(objpfx)summary-tmp $(objpfx)summary.texi
|
|
touch $@
|
|
|
|
# Generate a file which can be added to the `dir' content to provide direct
|
|
# access to the documentation of the function, variables, and other
|
|
# definitions.
|
|
$(objpfx)dir-add.texi: xtract-typefun.awk $(texis-path)
|
|
(echo "@dircategory GNU C library functions and macros"; \
|
|
echo "@direntry"; \
|
|
$(AWK) -f $^ | sort; \
|
|
echo "@end direntry") > $@.new
|
|
mv -f $@.new $@
|
|
|
|
# The table with the math errors is generated.
|
|
$(objpfx)libm-err.texi: $(objpfx)stamp-libm-err
|
|
$(objpfx)stamp-libm-err: libm-err-tab.pl $(wildcard $(foreach dir,$(sysdirs),\
|
|
$(dir)/libm-test-ulps))
|
|
pwd=`pwd`; \
|
|
$(PERL) $< $$pwd/.. > $(objpfx)libm-err-tmp
|
|
$(move-if-change) $(objpfx)libm-err-tmp $(objpfx)libm-err.texi
|
|
touch $@
|
|
|
|
# Package version and bug reporting URL.
|
|
$(objpfx)pkgvers.texi: $(objpfx)stamp-pkgvers ;
|
|
$(objpfx)stamp-pkgvers: $(common-objpfx)config.make
|
|
echo "@ifclear PKGVERS" > $(objpfx)pkgvers-tmp
|
|
echo "@set PKGVERS" >> $(objpfx)pkgvers-tmp
|
|
echo "@set PKGVERSION $(PKGVERSION_TEXI)" >> $(objpfx)pkgvers-tmp
|
|
if [ "$(PKGVERSION_TEXI)" = "(GNU libc) " ]; then \
|
|
echo "@set PKGVERSION_DEFAULT" >> $(objpfx)pkgvers-tmp; \
|
|
fi
|
|
echo "@set REPORT_BUGS_TO $(REPORT_BUGS_TEXI)" >> $(objpfx)pkgvers-tmp
|
|
echo "@end ifclear" >> $(objpfx)pkgvers-tmp
|
|
$(move-if-change) $(objpfx)pkgvers-tmp $(objpfx)pkgvers.texi
|
|
touch $@
|
|
|
|
# Generate a file with the version number.
|
|
$(objpfx)version.texi: $(objpfx)stamp-version ;
|
|
$(objpfx)stamp-version: $(common-objpfx)config.make
|
|
echo "@set VERSION $(version)" > $(objpfx)version-tmp
|
|
$(move-if-change) $(objpfx)version-tmp $(objpfx)version.texi
|
|
touch $@
|
|
|
|
# Generate Texinfo files from the C source for the example programs.
|
|
$(objpfx)%.c.texi: examples/%.c
|
|
sed -e '1,/^\*\/$$/d' \
|
|
-e 's,[{}],@&,g' \
|
|
-e 's,/\*\(@.*\)\*/,\1,g' \
|
|
-e 's,/\* *,/* @r{,g' -e 's, *\*/,} */,' \
|
|
-e 's/\(@[a-z][a-z]*\)@{\([^}]*\)@}/\1{\2}/g'\
|
|
$< | expand > $@.new
|
|
mv -f $@.new $@
|
|
|
|
$(objpfx)%.info: %.texinfo
|
|
LANGUAGE=C LC_ALL=C $(MAKEINFO) -P $(objpfx) --output=$@ $<
|
|
|
|
$(objpfx)%.dvi: %.texinfo
|
|
cd $(objpfx);$(TEXI2DVI) -I $(shell cd $(<D) && pwd) --output=$@ \
|
|
$(shell cd $(<D) && pwd)/$<
|
|
|
|
$(objpfx)%.pdf: %.texinfo
|
|
cd $(objpfx);$(TEXI2PDF) -I $(shell cd $(<D) && pwd) --output=$@ \
|
|
$(shell cd $(<D) && pwd)/$<
|
|
|
|
|
|
# Distribution.
|
|
minimal-dist = summary.pl texis.awk tsort.awk libc-texinfo.sh libc.texinfo \
|
|
libm-err.texi stamp-libm-err check-safety.sh \
|
|
$(filter-out summary.texi, $(nonexamples)) \
|
|
$(patsubst %.c.texi,examples/%.c, $(examples))
|
|
|
|
indices = cp fn pg tp vr ky
|
|
generated-dirs += libc
|
|
generated += libc.dvi libc.pdf libc.tmp libc.info* \
|
|
stubs \
|
|
texis summary.texi stamp-summary *.c.texi \
|
|
$(foreach index,$(indices),libc.$(index) libc.$(index)s) \
|
|
libc.log libc.aux libc.toc \
|
|
$(libc-texi-generated) \
|
|
stamp-libm-err stamp-version
|
|
|
|
include ../Rules
|
|
|
|
.PHONY: install subdir_install install-data
|
|
install-data subdir_install: install
|
|
# Generated files requiring perl: libm-err.texi, summary.texi
|
|
ifneq ($(PERL),no)
|
|
ifneq ($(strip $(MAKEINFO)),:)
|
|
install: $(inst_infodir)/libc.info
|
|
@if $(SHELL) -c '$(INSTALL_INFO) --version' >/dev/null 2>&1; then \
|
|
test -f $(inst_infodir)/dir || $(INSTALL_DATA) dir $(inst_infodir);\
|
|
$(INSTALL_INFO) --info-dir=$(inst_infodir) $(inst_infodir)/libc.info;\
|
|
else : ; fi
|
|
endif
|
|
endif
|
|
# Catchall implicit rule for other installation targets from the parent.
|
|
install-%: ;
|
|
|
|
$(inst_infodir)/libc.info: $(objpfx)libc.info
|
|
$(make-target-directory)
|
|
for file in $<*; do \
|
|
$(INSTALL_DATA) $$file $(@D)/; \
|
|
done
|
|
|
|
TAGS: $(minimal-dist)
|
|
$(ETAGS) -o $@ $^
|