diff options
| author |   Eric Hameleers <alien@slackware.com> | 2010-03-21 23:44:43 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2010-03-21 23:44:43 +0000 |
| commit | 661c990e07779ea7b378e3ea092c06b8b5cfd388 (patch) | |
| tree | c0e773044b02174fef91846d7f656b629ae08529 /compat32-tools | |
| parent | cdf8c9759604a4189eebc09b2a204c62cc02d3c8 (diff) | |
| download | multilib-661c990e07779ea7b378e3ea092c06b8b5cfd388.tar.gz multilib-661c990e07779ea7b378e3ea092c06b8b5cfd388.tar.xz | |
Prevent additions to /etc/ld.so.conf - no 32bit libdir wanted there!
Diffstat (limited to 'compat32-tools')
| -rwxr-xr-x | compat32-tools/convertpkg-compat32 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/compat32-tools/convertpkg-compat32 b/compat32-tools/convertpkg-compat32 index 1cb7428..4ec519c 100755 --- a/compat32-tools/convertpkg-compat32 +++ b/compat32-tools/convertpkg-compat32 @@ -199,7 +199,8 @@ if [ "$PKGNAM" = "gtk+2" -o "$PKGNAM" = "pango" ]; then fi elif [ -f install/doinst.sh ]; then # Only keep lines that deal with symlinks in bin/32 and lib directories: - ( cat install/doinst.sh |grep -E '(usr/bin |lib |lib/)' > install/doinst.sh.2 + ( cat install/doinst.sh |grep -v "etc/ld.so.conf" \ + |grep -E '(usr/bin |lib |lib/)' > install/doinst.sh.2 cat install/doinst.sh.2 |sed -e 's#usr/bin#usr/bin/32#g' > install/doinst.sh rm -f install/doinst.sh.2 ) || true fi |