Browse Source

glibc: add '/usr/lib{32,64}/*/' to ld.so.conf

Note:

We should migrate to a more modular approach here, moving to package
based configuration in '/etc/ld.so.conf.d/$pkg.conf' and including all
dedicated conf files in a generic main 'ld.so.conf' like this:

include /etc/ld.so.conf.d/*.conf
stable/0.2
Christian Wiese 14 years ago
parent
commit
9d3e9eef79
  1. 11
      base/glibc/glibc.conf

11
base/glibc/glibc.conf

@ -169,6 +169,13 @@ glibc_postmake()
# Install ld.so.conf # Install ld.so.conf
# #
# TODO
# We should migrate to a more modular approach here, moving to package
# based configuration in '/etc/ld.so.conf.d/$pkg.conf' and including all
# dedicated conf files in a generic main 'ld.so.conf' like this:
#
# include /etc/ld.so.conf.d/*.conf
#
case $arch_machine in case $arch_machine in
powerpc64|sparc64|x86_64|mips64) powerpc64|sparc64|x86_64|mips64)
cat > $root/etc/ld.so.conf <<-EOT cat > $root/etc/ld.so.conf <<-EOT
@ -176,6 +183,8 @@ glibc_postmake()
/lib /lib
/usr/lib64 /usr/lib64
/usr/lib /usr/lib
/usr/lib64/*/
/usr/lib/*/
/usr/*/lib64 /usr/*/lib64
/usr/*/lib /usr/*/lib
/opt/*/lib64 /opt/*/lib64
@ -187,6 +196,7 @@ EOT
cat >> $root/etc/ld.so.conf <<-EOT cat >> $root/etc/ld.so.conf <<-EOT
/lib32 /lib32
/usr/lib32 /usr/lib32
/usr/lib32/*/
/usr/*/lib32 /usr/*/lib32
/opt/*/lib32 /opt/*/lib32
/usr/local/lib32 /usr/local/lib32
@ -196,6 +206,7 @@ EOT
*) cat > $root/etc/ld.so.conf <<-EOT *) cat > $root/etc/ld.so.conf <<-EOT
/lib /lib
/usr/lib /usr/lib
/usr/lib/*/
/usr/*/lib /usr/*/lib
/opt/*/lib /opt/*/lib
/usr/local/lib /usr/local/lib

Loading…
Cancel
Save