blob: 142c6c0bb23c4c50267ecc128c1b4778d9609f0f (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
|
--- distro_fixes.sh.old 2017-04-06 15:12:56.520859032 -0700
+++ distro_fixes.sh 2017-04-06 14:55:20.578934713 -0700
@@ -137,6 +137,23 @@
dlog WARN "Could not find a 32-bit zlib"
fi
+elif [ x"$DF_ARCH" = x'64-bit' ] && [ x"$ARCH" = x'x86_64' ]; then
+ if [ x"$OS" = x'arch' ] || [ x"$OS" = x'antergos' ] || [ x"$OS" = x'manjarolinux' ]; then
+ find_zlib /usr/lib64/libz.so /usr/lib64
+ if [ -e "/usr/lib64/libstdc++.so.6" ]; then
+ export PRELOAD_LIB="${PRELOAD_LIB:+$PRELOAD_LIB:}/usr/lib64/libstdc++.so.6"
+ else
+ dlog WARN "Could not find /usr/lib64/libstdc++.so.6"
+ fi
+ else
+ dlog "WARN" "64bit 'Dwarf_Fortress' on unhandled 64bit OS detected. If you get 'missing file' errors, please open an issue on Github: https://github.com/Lazy-Newb-Pack/Lazy-Newb-Pack-Linux/issues."
+ find_zlib
+ fi
+
+ if [ -z "$ZLIB_PATH" ]; then
+ dlog WARN "Could not find a 64-bit zlib"
+ fi
+
elif [ x"$DF_ARCH" = x'32-bit' ]; then
find_zlib
fi
|