mirror of
https://abf.rosa.ru/djam/glibc.git
synced 2025-02-23 15:02:47 +00:00
do not create symlink which exists inside the package
Also, remove a strange hack, try without it
This commit is contained in:
parent
5139146b49
commit
64e9db52ae
1 changed files with 1 additions and 21 deletions
22
glibc.spec
22
glibc.spec
|
@ -404,11 +404,6 @@ if posix.access (ldsoconf) then
|
|||
end
|
||||
end
|
||||
|
||||
%ifarch aarch64
|
||||
-- ABI spec says it lib/ld-linux-aarch64.so.1 even though logic says lib64...
|
||||
posix.symlink("%{_libdir}/ld-linux-aarch64.so.1", "/lib/ld-linux-aarch64.so.1")
|
||||
%endif
|
||||
|
||||
-- Place compat symlink if the system is still split-usr
|
||||
local st=posix.stat("/%{_lib}")
|
||||
if st.type ~= "link" then
|
||||
|
@ -477,11 +472,6 @@ os.execute("/sbin/ldconfig -X")
|
|||
-- Need to repeat it here, deinstallation of an older version
|
||||
-- wiped out the files that used to be in the older versions
|
||||
|
||||
%ifarch aarch64
|
||||
-- ABI spec says it lib/ld-linux-aarch64.so.1 even though logic says lib64...
|
||||
posix.symlink("%{_libdir}/ld-linux-aarch64.so.1", "/lib/ld-linux-aarch64.so.1")
|
||||
%endif
|
||||
|
||||
-- Place compat symlink if the system is still split-usr
|
||||
st=posix.stat("/%{_lib}")
|
||||
if st.type ~= "link" then
|
||||
|
@ -721,16 +711,6 @@ LANG variable to their preferred language in their
|
|||
%{expand:%(sh %{S:1000} "Yau" "yuw" "yuw_PG")}
|
||||
%{expand:%(sh %{S:1000} "Chinese" "zh" "zh_CN" "zh_HK" "zh_SG" "zh_TW" "cmn_TW" "hak_TW" "lzh_TW" "nan_TW")}
|
||||
%{expand:%(sh %{S:1000} "Zulu" "zu" "zu_ZA")}
|
||||
|
||||
%ifarch aarch64
|
||||
# FIXME Workaround for the %%post script not being
|
||||
# able to run /bin/sh because of missing ld-linux-aarch64.so.1
|
||||
# symlink while building docker-builder
|
||||
# This should really not be necessary, but somehow it is.
|
||||
%pre -n locales-en -p <lua>
|
||||
posix.symlink("%{_libdir}/ld-linux-aarch64.so.1", "/lib/ld-linux-aarch64.so.1")
|
||||
%endif
|
||||
|
||||
%endif
|
||||
|
||||
%files -f libc.lang
|
||||
|
@ -1939,7 +1919,7 @@ rm -f %{buildroot}%{_prefix}/lib/libcrypt.so
|
|||
|
||||
%ifarch aarch64
|
||||
# Compat symlink -- some versions of ld hardcoded /lib/ld-linux-aarch64.so.1
|
||||
# as dynamic loader
|
||||
# as dynamic loader (probably die to ABI spec saying this)
|
||||
mkdir -p %{buildroot}/lib
|
||||
ln -s /lib64/ld-linux-aarch64.so.1 %{buildroot}/lib/ld-linux-aarch64.so.1
|
||||
%endif
|
||||
|
|
Loading…
Add table
Reference in a new issue