rpms/glibc
7
0
Fork 1
Code Issues Pull Requests Releases Activity

glibc_post_upgrade: Do not clean up tls subdirectories

Browse Source 
These were removed a long time ago.
This commit is contained in:
Florian Weimer 2018-01-19 15:07:33 +01:00
parent 91ed2dbf62
commit 365663e72b
2 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
glibc.spec
View File

@ -1010,7 +1010,6 @@ build
pushd build-%{target} pushd build-%{target}
$GCC -static -L. -Os -g %{SOURCE2} \ $GCC -static -L. -Os -g %{SOURCE2} \
-o glibc_post_upgrade.%{_target_cpu} \ -o glibc_post_upgrade.%{_target_cpu} \
'-DLIBTLS="/%{_lib}/tls/"' \
'-DGCONV_MODULES_DIR="%{_libdir}/gconv"' \ '-DGCONV_MODULES_DIR="%{_libdir}/gconv"' \
'-DLD_SO_CONF="/etc/ld.so.conf"' \ '-DLD_SO_CONF="/etc/ld.so.conf"' \
'-DICONVCONFIG="%{_sbindir}/iconvconfig.%{_target_cpu}"' '-DICONVCONFIG="%{_sbindir}/iconvconfig.%{_target_cpu}"'

8
glibc_post_upgrade.c
View File

@ -51,18 +51,10 @@ main (void)
const char *remove_dirs[] = const char *remove_dirs[] =
{ {
#if defined (__i386__) #if defined (__i386__)
"/lib/tls",
"/lib/i686", "/lib/i686",
"/lib/tls/i486",
"/lib/tls/i586",
"/lib/tls/i686",
"/lib/i686/nosegneg", "/lib/i686/nosegneg",
#elif defined (__powerpc64__) && _CALL_ELF != 2 #elif defined (__powerpc64__) && _CALL_ELF != 2
"/lib64/power6", "/lib64/power6",
#elif defined (LIBTLS)
LIBTLS,
#else
"/lib/tls",
#endif #endif
}; };
for (j = 0; j < sizeof (remove_dirs) / sizeof (remove_dirs[0]); ++j) for (j = 0; j < sizeof (remove_dirs) / sizeof (remove_dirs[0]); ++j)