diff options
| author | Wim Taymans <wtaymans@redhat.com> | 2014-02-06 12:41:58 +0100 |
|---|---|---|
| committer | Wim Taymans <wtaymans@redhat.com> | 2014-02-06 12:41:58 +0100 |
| commit | 5962073fac0d8365929cc8c9c97a803c9f524b13 (patch) | |
| tree | 0e750b09cf32626f210c4e34a0fcdbd66ac0fa5b | |
| parent | 7853f8212eb7d1c6ab746739c0d81d4792fa68a7 (diff) | |
Related: #884146
Avoid multilib conflict in /usr/bin/padsp
| -rw-r--r-- | src/utils/padsp.in | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/src/utils/padsp.in b/src/utils/padsp.in index 4ecce8cfd..18af72c6d 100644 --- a/src/utils/padsp.in +++ b/src/utils/padsp.in @@ -75,10 +75,21 @@ done shift $(( $OPTIND - 1 )) +ARCH=$(uname -m) + +case $ARCH in + x86_64 | sparc64 | s390x | ppc64) + LIB_DIR=/usr/lib64 + ;; + *) + LIB_DIR=/usr/lib + ;; +esac + if [ x"$LD_PRELOAD" = x ] ; then - LD_PRELOAD="@pkglibdir@/libpulsedsp.so" + LD_PRELOAD="$LIBDIR/pulseaudio/libpulsedsp.so" else - LD_PRELOAD="$LD_PRELOAD @pkglibdir@/libpulsedsp.so" + LD_PRELOAD="$LD_PRELOAD $LIBDIR/pulseaudio/libpulsedsp.so" fi export LD_PRELOAD |