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

Remove architecture-specific symbolic link for iconvconfig

Browse Source 
Its purpose is not entirely clear.  glibc_post_upgrade invokes
iconvconfig with explicit paths, so it does not matter for which
multilib variant the binary was built.
This commit is contained in:
Florian Weimer 2018-01-19 15:30:50 +01:00
parent e33b0e3197
commit 707a1e8f87
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
glibc.spec
View File

@ -1010,8 +1010,7 @@ 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} \
'-DGCONV_MODULES_DIR="%{_libdir}/gconv"' \ '-DGCONV_MODULES_DIR="%{_libdir}/gconv"'
'-DICONVCONFIG="%{_sbindir}/iconvconfig.%{_target_cpu}"'
popd popd
############################################################################## ##############################################################################
@ -1254,9 +1253,6 @@ install -m 700 build-%{target}/glibc_post_upgrade.%{_target_cpu} \
# Strip all of the installed object files. # Strip all of the installed object files.
strip -g $RPM_BUILD_ROOT%{_libdir}/*.o strip -g $RPM_BUILD_ROOT%{_libdir}/*.o
# XXX: Ugly hack for buggy rpm. What bug? BZ? Is this fixed?
ln -f ${RPM_BUILD_ROOT}%{_sbindir}/iconvconfig{,.%{_target_cpu}}
############################################################################## ##############################################################################
# Install debug copies of unstripped static libraries # Install debug copies of unstripped static libraries
# - This step must be last in order to capture any additional static # - This step must be last in order to capture any additional static

4
glibc_post_upgrade.c
View File

@ -12,6 +12,7 @@
#include <elf.h> #include <elf.h>
#define LD_SO_CONF "/etc/ld.so.conf" #define LD_SO_CONF "/etc/ld.so.conf"
#define ICONVCONFIG "/usr/sbin/iconvconfig"
#define verbose_exec(failcode, path...) \ #define verbose_exec(failcode, path...) \
do \ do \
@ -128,9 +129,6 @@ main (void)
if (! utimes (GCONV_MODULES_DIR "/gconv-modules.cache", NULL)) if (! utimes (GCONV_MODULES_DIR "/gconv-modules.cache", NULL))
{ {
#ifndef ICONVCONFIG
#define ICONVCONFIG "/usr/sbin/iconvconfig"
#endif
char *iconv_cache = GCONV_MODULES_DIR"/gconv-modules.cache"; char *iconv_cache = GCONV_MODULES_DIR"/gconv-modules.cache";
char *iconv_dir = GCONV_MODULES_DIR; char *iconv_dir = GCONV_MODULES_DIR;
verbose_exec (113, ICONVCONFIG, "/usr/sbin/iconvconfig", verbose_exec (113, ICONVCONFIG, "/usr/sbin/iconvconfig",