lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-08-01 10:06:57 +03:00
Code Activity

Remove support for removing glibc 2.0 headers.

Browse Source 
There is a configure test for the presence of glibc 2.0 headers (that
were renamed / no longer installed in glibc 2.1) and associated
support for removing them on "make install".

Normal practice for subsequent removal / renaming of installed files
has been not to do anything special about removing them; if you want
installed files from an old installation removed reliably, you need to
use a packaging system that tracks what files were installed by a
previous glibc package (via installing in an intermediate directory
with install_root).  I think it's been long enough since 2.0 that it's
not particularly useful to have that special logic for those old
headers either; this patch removes it.

Tested for x86_64 and x86 (testsuite, and that installed shared
libraries are unchanged by the patch).

	* configure.ac (old_glibc_headers): Remove configure test.
	* configure: Regenerated.
	* config.make.in (old-glibc-headers): Remove variable.
	* Makefile [!$(install_root) && $(old-glibc-headers) = yes]
	(install): Remove dependency on remove-old-headers.
	(headers2_0): Remove variable.
	(remove-old-headers): Remove rule.
This commit is contained in:
Joseph Myers
2015-10-26 22:46:04 +00:00
parent 8c0c01dbe7
commit f5659917f9
5 changed files with 8 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
configure vendored
View File

@ -607,7 +607,6 @@ libc_cv_sysconfdir
libc_cv_localedir
libc_cv_rtlddir
libc_cv_slibdir
old_glibc_headers
use_nscd
libc_cv_gcc_unwind_find_fde
libc_extra_cppflags
@ -6791,26 +6790,6 @@ if test "x$build_nscd" = xdefault; then
build_nscd=$use_nscd
fi
# Test for old glibc 2.0.x headers so that they can be removed properly
# Search only in includedir.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for old glibc 2.0.x headers" >&5
$as_echo_n "checking for old glibc 2.0.x headers... " >&6; }
if eval test -f "${includedir}/elfclass.h" -a -f "${includedir}/fcntlbits.h"
then
old_glibc_headers=yes
else
old_glibc_headers=no
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $old_glibc_headers" >&5
$as_echo "$old_glibc_headers" >&6; }
if test ${old_glibc_headers} = yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** During \"make install\" old headers from glibc 2.0.x will" >&5
$as_echo "$as_me: WARNING: *** During \"make install\" old headers from glibc 2.0.x will" >&2;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** be removed." >&5
$as_echo "$as_me: WARNING: *** be removed." >&2;}
fi