mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-26 12:41:05 +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.
220 lines
6.5 KiB
Perl
Executable File
220 lines
6.5 KiB
Perl
Executable File
#!/usr/bin/perl -w
|
|
# Copyright (C) 1997-2017 Free Software Foundation, Inc.
|
|
# This file is part of the GNU C Library.
|
|
# Contributed by Andreas Jaeger <aj@arthur.rhein-neckar.de>, 1997.
|
|
|
|
# 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/>.
|
|
|
|
|
|
$PACKAGE = "libc";
|
|
$progname = $0;
|
|
if ($ENV{CC}) {
|
|
$CC = $ENV{CC};
|
|
} else {
|
|
$CC= "gcc";
|
|
}
|
|
if ($ENV{LD_SO}) {
|
|
$LD_SO = $ENV{LD_SO};
|
|
} else {
|
|
$LD_SO = "";
|
|
}
|
|
|
|
sub usage {
|
|
print "Usage: test-installation [soversions.mk]\n";
|
|
print " --help print this help, then exit\n";
|
|
print " --version print version number, then exit\n";
|
|
exit 0;
|
|
}
|
|
|
|
sub installation_problem {
|
|
print "The script has found some problems with your installation!\n";
|
|
print "Please read the FAQ and the README file and check the following:\n";
|
|
print "- Did you change the gcc specs file (necessary after upgrading from\n";
|
|
print " Linux libc5)?\n";
|
|
print "- Are there any symbolic links of the form libXXX.so to old libraries?\n";
|
|
print " Links like libm.so -> libm.so.5 (where libm.so.5 is an old library) are wrong,\n";
|
|
print " libm.so should point to the newly installed glibc file - and there should be\n";
|
|
print " only one such link (check e.g. /lib and /usr/lib)\n";
|
|
print "You should restart this script from your build directory after you've\n";
|
|
print "fixed all problems!\n";
|
|
print "Btw. the script doesn't work if you're installing GNU libc not as your\n";
|
|
print "primary library!\n";
|
|
exit 1;
|
|
}
|
|
|
|
arglist: while (@ARGV) {
|
|
if ($ARGV[0] eq "--v" || $ARGV[0] eq "--ve" || $ARGV[0] eq "--ver" ||
|
|
$ARGV[0] eq "--vers" || $ARGV[0] eq "--versi" ||
|
|
$ARGV[0] eq "--versio" || $ARGV[0] eq "--version") {
|
|
print "test-installation (GNU $PACKAGE)\n";
|
|
print "Copyright (C) 2017 Free Software Foundation, Inc.\n";
|
|
print "This is free software; see the source for copying conditions. There is NO\n";
|
|
print "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n";
|
|
print "Written by Andreas Jaeger <aj\@arthur.rhein-neckar.de>\n";
|
|
|
|
exit 0;
|
|
} elsif ($ARGV[0] eq "--h" || $ARGV[0] eq "--he" || $ARGV[0] eq "--hel" ||
|
|
$ARGV[0] eq "--help") {
|
|
&usage;
|
|
} elsif ($ARGV[0] =~ /^-/) {
|
|
print "$progname: unrecognized option `$ARGV[0]'\n";
|
|
print "Try `$progname --help' for more information.\n";
|
|
exit 1;
|
|
} else {
|
|
last arglist;
|
|
}
|
|
}
|
|
|
|
# We expect none or one argument.
|
|
if ($#ARGV == -1) {
|
|
$soversions="soversions.mk";
|
|
$config="config.make";
|
|
} elsif ($#ARGV == 0) {
|
|
if (-d $ARGV[0]) {
|
|
$soversions = "$ARGV[0]/soversions.mk";
|
|
$config = "$ARGV[0]/config.make";
|
|
} else {
|
|
$soversions = $dir = $ARGV[0];
|
|
$dir =~ s!/?[^/]*/*$!!;
|
|
$config = $dir . "/config.make";
|
|
}
|
|
} else {
|
|
die "Wrong number of arguments.";
|
|
}
|
|
|
|
if (system ("grep -q \"build-mathvec = yes\" $config") == 0) {
|
|
$build_mathvec = 1;
|
|
} else {
|
|
$build_mathvec = 0;
|
|
}
|
|
|
|
# Read names and versions of all shared libraries that are part of
|
|
# glibc
|
|
open SOVERSIONS, $soversions
|
|
or die ("Couldn't open $soversions in build directory!");
|
|
|
|
$link_libs = "";
|
|
%versions = ();
|
|
|
|
while (<SOVERSIONS>) {
|
|
next if (/^all-sonames/);
|
|
chop;
|
|
if (/^lib/) {
|
|
($name, $version)= /^lib(.*)\.so-version=\.(.*)$/;
|
|
# Filter out some libraries we don't want to link:
|
|
# - nss_ldap since it's not yet available
|
|
# - libdb1 since it conflicts with libdb
|
|
# - libthread_db since it contains unresolved references
|
|
# - it's just a test NSS module
|
|
# - We don't provide the libgcc so we don't test it
|
|
# - libmvec if it wasn't built
|
|
next if ($build_mathvec == 0 && $name eq "mvec");
|
|
if ($name ne "nss_ldap" && $name ne "db1"
|
|
&& $name ne "thread_db"
|
|
&& $name ne "nss_test1" && $name ne "libgcc_s") {
|
|
$link_libs .= " -l$name";
|
|
$versions{$name} = $version;
|
|
}
|
|
} elsif ($LD_SO ne "") {
|
|
($ld_so_name, $ld_so_version) = split ('\.so\.', $LD_SO);
|
|
} else {
|
|
if (/^ld\.so/) {
|
|
($ld_so_name, $ld_so_version)= /=(.*)\.so\.(.*)$/;
|
|
}
|
|
}
|
|
}
|
|
|
|
close SOVERSIONS;
|
|
|
|
# Create test program and link it against all
|
|
# shared libraries
|
|
|
|
open PRG, ">/tmp/test-prg$$.c"
|
|
or die ("Couldn't write test file /tmp/test-prg$$.c");
|
|
|
|
print PRG '
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
int main(void) {
|
|
printf ("Your new glibc installation seems to be ok.\n");
|
|
exit (0);
|
|
}
|
|
';
|
|
close PRG;
|
|
|
|
open GCC, "$CC /tmp/test-prg$$.c $link_libs -o /tmp/test-prg$$ 2>&1 |"
|
|
or die ("Couldn't execute $CC!");
|
|
|
|
while (<GCC>) {
|
|
print $_ if (! /warning/);
|
|
}
|
|
close GCC;
|
|
if ($?) {
|
|
print "Execution of $CC failed!\n";
|
|
&installation_problem;
|
|
}
|
|
|
|
# Test if test program is linked against the right versions of
|
|
# shared libraries
|
|
|
|
$ok = 1;
|
|
%found = ();
|
|
|
|
open LDD, "ldd /tmp/test-prg$$ |"
|
|
or die ("Couldn't execute ldd");
|
|
while (<LDD>) {
|
|
if (/^\s*lib/) {
|
|
($name, $version1, $version2) =
|
|
/^\s*lib(\w*)\.so\.([0-9\.]*)\s*=>.*\.so\.([0-9\.]*)/;
|
|
$found{$name} = 1;
|
|
if ($versions{$name} ne $version1 || $version1 ne $version2) {
|
|
print "Library lib$name is not correctly installed.\n";
|
|
print "Please check your installation!\n";
|
|
print "Offending line of ldd output: $_\n";
|
|
$ok = 0;
|
|
}
|
|
}
|
|
if (/$ld_so_name/) {
|
|
($version1) = /$ld_so_name\.so\.([0-9\.]*)/;
|
|
if ($version1 ne $ld_so_version) {
|
|
print "The dynamic linker $ld_so_name.so is not correctly installed.\n";
|
|
print "Please check your installation!\n";
|
|
print "Offending line of ldd output: $_\n";
|
|
$ok = 0;
|
|
}
|
|
}
|
|
}
|
|
|
|
close LDD;
|
|
die "ldd execution failed" if $?;
|
|
|
|
foreach (keys %versions) {
|
|
unless ($found{$_}) {
|
|
print "Library lib$_ is not correctly installed since the test program\n";
|
|
print "was not linked dynamically against it.\n";
|
|
print "Do you have a file/link lib$_.so?\n";
|
|
$ok = 0;
|
|
}
|
|
}
|
|
|
|
&installation_problem unless $ok;
|
|
|
|
# Finally execute the test program
|
|
system ("/tmp/test-prg$$") == 0
|
|
or die ("Execution of test program failed");
|
|
|
|
# Clean up after ourselves
|
|
unlink ("/tmp/test-prg$$", "/tmp/test-prg$$.c");
|