hiro/tdesktop
1
0
Fork 0
mirror of https://github.com/vale981/tdesktop synced 2025-03-06 10:11:41 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Using /usr/local libssl, libcrypto and libz when linking the build.

Browse source 
The previous version crashed in gtk file picker on Gentoo with KDE.
See #2278
This commit is contained in:
John Preston 2016-07-27 16:48:52 +03:00
parent b0a8787eaf
commit 0228941fdb
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Telegram/build/makefile_static.sh
View file

@ -38,7 +38,9 @@ fi
Replace () {
CheckCommand="grep -ci '$1' Makefile"
set +e
CheckCount=$(eval $CheckCommand)
set -e
if [ "$CheckCount" -gt 0 ]; then
echo "Requested '$1' to '$2', found - replacing.."
ReplaceCommand="sed -i'.~' 's/$1/$2/g' Makefile"
@ -48,9 +50,6 @@ Replace () {
fi
}
Replace '\-lssl' "$ArchDirPath\/libssl\.a"
Replace '\-lcrypto' "$ArchDirPath\/libcrypto\.a"
Replace '\-lz' "$ArchDirPath\/libz\.a"
Replace '\-llzma' "$ArchDirPath\/liblzma\.a"
Replace '\-lXi' "$ArchDirPath\/libXi\.a $ArchDirPath\/libXext\.a"
Replace '\-lSM' "$ArchDirPath\/libSM\.a"
@ -58,6 +57,7 @@ Replace '\-lICE' "$ArchDirPath\/libICE\.a"
Replace '\-lfontconfig' "$ArchDirPath\/libfontconfig\.a $ArchDirPath\/libexpat\.a"
Replace '\-lfreetype' "$ArchDirPath\/libfreetype\.a"
Replace '\-lXext' "$ArchDirPath\/libXext\.a"
Replace '\-lz' "$LocalDirPath\/libz\.a"
Replace '\-lopus' "$LocalDirPath\/libopus\.a"
Replace '\-lopenal' "$LocalDirPath\/libopenal\.a"
Replace '\-lavformat' "$LocalDirPath\/libavformat\.a"