Browse Source

Changed fhs to create the proper lib dirs for multilib and set the default to SDECFG_ABI_DEFAULT

user/chris/old/multilib
Christian Wiese 17 years ago
committed by Christian Wiese
parent
commit
11a1a4fb75
1 changed files with 5 additions and 4 deletions
  1. +5
    -4
      base/fhs/fhs-3-lib.sh

+ 5
- 4
base/fhs/fhs-3-lib.sh

@ -2,7 +2,7 @@
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# #
# Filename: package/.../fhs/fhs-3-lib.sh # Filename: package/.../fhs/fhs-3-lib.sh
# Copyright (C) 2006 The OpenSDE Project
# Copyright (C) 2006 - 2008 The OpenSDE Project
# #
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
# #
@ -17,7 +17,7 @@ lib=
if [ "$SDECFG_MULTILIB" = 1 ]; then if [ "$SDECFG_MULTILIB" = 1 ]; then
case $arch_machine in case $arch_machine in
powerpc64|sparc64|x86_64|mips64) powerpc64|sparc64|x86_64|mips64)
lib=lib64 ;;
lib="lib${SDECFG_ABI_DEFAULT}" ;;
esac esac
fi fi
@ -25,8 +25,9 @@ for x in '' 'usr/' 'usr/local/'; do
if [ -z "$lib" ]; then if [ -z "$lib" ]; then
echo "m ${x}lib" echo "m ${x}lib"
else else
echo "m ${x}lib32"
echo "m ${x}lib64"
for abi in $arch_abis; do
echo "m ${x}lib${abi}"
done
echo "l ${x}lib $lib" echo "l ${x}lib $lib"
fi fi
done done

Loading…
Cancel
Save