Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'jb46501' into 'master'
[glibc] Use an absolute path in ld.so.conf. Contributes to JB#46501

See merge request mer-core/glibc!30
  • Loading branch information
martyone committed Jul 10, 2019
2 parents 5282ace + f84a64c commit c36af69
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion glibc.spec
Expand Up @@ -168,6 +168,7 @@ libraries, as well as national language (locale) support.

# We need to run ldconfig manually because ldconfig cannot handle the
# relative include path in the /etc/ld.so.conf file we gneerate.
# Note: Currently an absolute path is in use
%undefine __brp_ldconfig

######################################################################
Expand Down Expand Up @@ -433,7 +434,7 @@ install -m 644 %{glibcsrcdir}/nscd/nscd.service %{glibc_sysroot}/lib/systemd/sys
%endif

# Include ld.so.conf
echo 'include ld.so.conf.d/*.conf' > %{glibc_sysroot}/etc/ld.so.conf
echo 'include /etc/ld.so.conf.d/*.conf' > %{glibc_sysroot}/etc/ld.so.conf
echo -n '' > %{glibc_sysroot}/etc/ld.so.cache
chmod 644 %{glibc_sysroot}/etc/ld.so.conf
mkdir -p %{glibc_sysroot}/etc/ld.so.conf.d
Expand Down

0 comments on commit c36af69

Please sign in to comment.