Commit d352f4e1 authored by Mikhail Tergoev's avatar Mikhail Tergoev

fix glib_c in runlib

parent 8d1c5efe
...@@ -56,13 +56,16 @@ export PATH_OLD="$PATH" ...@@ -56,13 +56,16 @@ export PATH_OLD="$PATH"
. "${link}"/lang . "${link}"/lang
######################################################################## ########################################################################
GLIBC_REQUIRED=2.27 GLIBC_REQUIRED=2.23
GLIBC_VERSION="$(ldd --version | head -n1 | sed 's/\(.*\) //g' | sed 's/\.[^.]*//2g')" GLIBC_VERSION="$(ldd --version | head -n1 | sed 's/\(.*\) //g' | sed 's/\.[^.]*//2g')"
if [ "$(echo "${GLIBC_VERSION//./}")" -lt "$(echo "${GLIBC_REQUIRED//./}")" ]; then
if [ "$(echo ${GLIBC_VERSION} | sed 's/\.//g')" -lt "$(echo ${GLIBC_REQUIRED} | sed 's/\.//g')" ]
then
WINEDIR="${PORT_WINE_PATH}"/data/wine_glibc_223 WINEDIR="${PORT_WINE_PATH}"/data/wine_glibc_223
else else
WINEDIR="${PORT_WINE_PATH}"/data/wine_glibc_227 WINEDIR="${PORT_WINE_PATH}"/data/wine_glibc_227
fi fi
echo "Used WINE: ${WINEDIR}"
######################################################################## ########################################################################
if [ ! -d "${WINEDIR}/lib64" ] if [ ! -d "${WINEDIR}/lib64" ]
then then
...@@ -112,20 +115,22 @@ export WINEFSYNC=1 ...@@ -112,20 +115,22 @@ export WINEFSYNC=1
export PROTON_NO_FSYNC=0 export PROTON_NO_FSYNC=0
# Check if Wine has PBA or ESYNC features # Check if Wine has PBA or ESYNC features
if grep PBA "${WINEDIR}/lib/wine/wined3d.dll.so" &>/dev/null || grep PBA "${WINEDIR}/lib64/wine/wined3d.dll.so" &>/dev/null; then if grep PBA "${WINEDIR}/lib/wine/wined3d.dll.so" &>/dev/null || grep PBA "${WINEDIR}/lib64/wine/wined3d.dll.so" &>/dev/null
then
PBA_ENABLE=1 PBA_ENABLE=1
else else
PBA_ENABLE=0 PBA_ENABLE=0
fi fi
if grep ESYNC "${WINEDIR}/lib/wine/ntdll.dll.so" &>/dev/null || grep ESYNC "${WINEDIR}/lib64/wine/ntdll.dll.so" &>/dev/null; #if grep ESYNC "${WINEDIR}/lib/wine/ntdll.dll.so" &>/dev/null || grep ESYNC "${WINEDIR}/lib64/wine/ntdll.dll.so" &>/dev/null
then #then
if ! ulimit -n 500000 &>/dev/null; then # if ! ulimit -n 500000 &>/dev/null
# then
export WINEESYNC=0 export WINEESYNC=0
else # else
export WINEESYNC=1 # export WINEESYNC=1
fi # fi
fi #fi
######################################################################## ########################################################################
START_PORTWINE () START_PORTWINE ()
...@@ -152,13 +157,6 @@ then ...@@ -152,13 +157,6 @@ then
export VK_ICD_FILENAMES=/usr/share/vulkan/icd.d/nvidia_icd.json export VK_ICD_FILENAMES=/usr/share/vulkan/icd.d/nvidia_icd.json
fi fi
export int_xneur=0
if [ $(pgrep xneur)>'0' ]
then
killall xneur
export int_xneur=1
fi
sh "${link}"/port_update sh "${link}"/port_update
#rm -f "$WINEPREFIX/dosdevices/z:" #rm -f "$WINEPREFIX/dosdevices/z:"
...@@ -232,11 +230,6 @@ do ...@@ -232,11 +230,6 @@ do
sleep 5 sleep 5
done done
if [ "$int_xneur" -eq "1" ]
then
xneur &
fi
if [ "${update_loc}" = "RUS" ] if [ "${update_loc}" = "RUS" ]
then then
export LC_COLLATE="${LC_COLLATE_old}" export LC_COLLATE="${LC_COLLATE_old}"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment