- remove refs to openssl (we can use gnutls for ssl)
This commit is contained in:
parent
07c2af4b99
commit
3d158ed159
|
@ -22,7 +22,7 @@ sync_support_libs(){
|
||||||
local _cp="/bin/cp"
|
local _cp="/bin/cp"
|
||||||
#local skip_deps="libm.so libpthread.so libstdc++.so libgcc_s.so libc.so libdl.so libX11.so libpulse libfusion libdirect libnvidia libXext librt libxcb libICE libSM libXtst libwrap libdbus libXau libXdmcp libnsl libFLAC libGL"
|
#local skip_deps="libm.so libpthread.so libstdc++.so libgcc_s.so libc.so libdl.so libX11.so libpulse libfusion libdirect libnvidia libXext librt libxcb libICE libSM libXtst libwrap libdbus libXau libXdmcp libnsl libFLAC libGL"
|
||||||
local skip_deps=""
|
local skip_deps=""
|
||||||
local keep_deps="libcurl libgnu libicu liblua libjpeg libpng libwx libgtk libgdk libftgl libfreetype libvlc libssl libcrypto"
|
local keep_deps="libcurl libgnu libgcrypt libicu liblua libjpeg libpng libwx libgtk libgdk libftgl libfreetype libvlc"
|
||||||
|
|
||||||
local scan_via_skiplist=1
|
local scan_via_skiplist=1
|
||||||
|
|
||||||
|
|
|
@ -22,7 +22,7 @@ sync_support_libs(){
|
||||||
local _cp="/bin/cp"
|
local _cp="/bin/cp"
|
||||||
#local skip_deps="libm.so libpthread.so libstdc++.so libgcc_s.so libc.so libdl.so libX11.so libpulse libfusion libdirect libnvidia libXext librt libxcb libICE libSM libXtst libwrap libdbus libXau libXdmcp libnsl libFLAC libGL"
|
#local skip_deps="libm.so libpthread.so libstdc++.so libgcc_s.so libc.so libdl.so libX11.so libpulse libfusion libdirect libnvidia libXext librt libxcb libICE libSM libXtst libwrap libdbus libXau libXdmcp libnsl libFLAC libGL"
|
||||||
local skip_deps=""
|
local skip_deps=""
|
||||||
local keep_deps="libcurl libgnu libicu liblua libjpeg libpng libwx libgtk libgdk libftgl libfreetype libvlc libssl libcrypto"
|
local keep_deps="libcurl libgnu libgcrypt libicu liblua libjpeg libpng libwx libgtk libgdk libftgl libfreetype libvlc"
|
||||||
|
|
||||||
local scan_via_skiplist=1
|
local scan_via_skiplist=1
|
||||||
|
|
||||||
|
|
|
@ -162,7 +162,7 @@ FREETYPE_LINKEDLIBNAME='libfreetype.so.6'
|
||||||
FREETYPE_LIBLOOKUP1=${FREETYPE_LINKEDLIBNAME}
|
FREETYPE_LIBLOOKUP1=${FREETYPE_LINKEDLIBNAME}
|
||||||
FREETYPE_LIBLOOKUP2='libfreetype.so.'
|
FREETYPE_LIBLOOKUP2='libfreetype.so.'
|
||||||
|
|
||||||
GNUTLS_LINKEDLIBNAME='libgnutls.so.13'
|
GNUTLS_LINKEDLIBNAME='libgnutls.so.26'
|
||||||
GNUTLS_LIBLOOKUP1=${GNUTLS_LINKEDLIBNAME}
|
GNUTLS_LIBLOOKUP1=${GNUTLS_LINKEDLIBNAME}
|
||||||
GNUTLS_LIBLOOKUP2='libgnutls.so.'
|
GNUTLS_LIBLOOKUP2='libgnutls.so.'
|
||||||
|
|
||||||
|
@ -198,13 +198,9 @@ VLCCORE_LINKEDLIBNAME='libvlccore.so.5'
|
||||||
VLCCORE_LIBLOOKUP1=${VLCCORE_LINKEDLIBNAME}
|
VLCCORE_LIBLOOKUP1=${VLCCORE_LINKEDLIBNAME}
|
||||||
VLCCORE_LIBLOOKUP2='libvlccore.so.'
|
VLCCORE_LIBLOOKUP2='libvlccore.so.'
|
||||||
|
|
||||||
SSL_LINKEDLIBNAME='libssl.so.0.9.8'
|
GCRYPT_LINKEDLIBNAME='libgcrypt.so.11'
|
||||||
SSL_LIBLOOKUP1=${SSL_LINKEDLIBNAME}
|
GCRYPT_LIBLOOKUP1=${GCRYPT_LINKEDLIBNAME}
|
||||||
SSL_LIBLOOKUP2='libssl.so.'
|
GCRYPT_LIBLOOKUP2='libgcrypt.so.'
|
||||||
|
|
||||||
CRYPTO_LINKEDLIBNAME='libcrypto.so.0.9.8'
|
|
||||||
CRYPTO_LIBLOOKUP1=${CRYPTO_LINKEDLIBNAME}
|
|
||||||
CRYPTO_LIBLOOKUP2='libcrypto.so.'
|
|
||||||
|
|
||||||
if [ "$OS_TYPE"'_' = 'x86_64_' ]; then
|
if [ "$OS_TYPE"'_' = 'x86_64_' ]; then
|
||||||
DIRECTFB_LINKEDLIBNAME='libdirectfb-1.2.so.0'
|
DIRECTFB_LINKEDLIBNAME='libdirectfb-1.2.so.0'
|
||||||
|
@ -234,6 +230,11 @@ if [ "$OS_TYPE"'_' = 'x86_64_' ]; then
|
||||||
GNUTLS_LINKEDLIBNAME='libgnutls.so.26'
|
GNUTLS_LINKEDLIBNAME='libgnutls.so.26'
|
||||||
GNUTLS_LIBLOOKUP1=${GNUTLS_LINKEDLIBNAME}
|
GNUTLS_LIBLOOKUP1=${GNUTLS_LINKEDLIBNAME}
|
||||||
GNUTLS_LIBLOOKUP2='libgnutls.so.'
|
GNUTLS_LIBLOOKUP2='libgnutls.so.'
|
||||||
|
|
||||||
|
GCRYPT_LINKEDLIBNAME='libgcrypt.so.11'
|
||||||
|
GCRYPT_LIBLOOKUP1=${GCRYPT_LINKEDLIBNAME}
|
||||||
|
GCRYPT_LIBLOOKUP2='libgcrypt.so.'
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
@ -277,8 +278,7 @@ findMissingSO "$LDCONFIG" "$GAMEDIR/$LIBDIR/${IRC_LINKEDLIBNAME}" "$IRC_LIBLOOKU
|
||||||
findMissingSO "$LDCONFIG" "$GAMEDIR/$LIBDIR/${DL_LINKEDLIBNAME}" "$DL_LIBLOOKUP1" "$DL_LIBLOOKUP2"
|
findMissingSO "$LDCONFIG" "$GAMEDIR/$LIBDIR/${DL_LINKEDLIBNAME}" "$DL_LIBLOOKUP1" "$DL_LIBLOOKUP2"
|
||||||
findMissingSO "$LDCONFIG" "$GAMEDIR/$LIBDIR/${VLCCORE_LINKEDLIBNAME}" "$VLCCORE_LIBLOOKUP1" "$VLCCORE_LIBLOOKUP2"
|
findMissingSO "$LDCONFIG" "$GAMEDIR/$LIBDIR/${VLCCORE_LINKEDLIBNAME}" "$VLCCORE_LIBLOOKUP1" "$VLCCORE_LIBLOOKUP2"
|
||||||
findMissingSO "$LDCONFIG" "$GAMEDIR/$LIBDIR/${VLC_LINKEDLIBNAME}" "$VLC_LIBLOOKUP1" "$VLC_LIBLOOKUP2"
|
findMissingSO "$LDCONFIG" "$GAMEDIR/$LIBDIR/${VLC_LINKEDLIBNAME}" "$VLC_LIBLOOKUP1" "$VLC_LIBLOOKUP2"
|
||||||
#findMissingSO "$LDCONFIG" "$GAMEDIR/$LIBDIR/${SSL_LINKEDLIBNAME}" "$SSL_LIBLOOKUP1" "$SSL_LIBLOOKUP2"
|
findMissingSO "$LDCONFIG" "$GAMEDIR/$LIBDIR/${GCRYPT_LINKEDLIBNAME}" "$GCRYPT_LIBLOOKUP1" "$GCRYPT_LIBLOOKUP2"
|
||||||
#findMissingSO "$LDCONFIG" "$GAMEDIR/$LIBDIR/${CRYPTO_LINKEDLIBNAME}" "$CRYPTO_LIBLOOKUP1" "$CRYPTO_LIBLOOKUP2"
|
|
||||||
|
|
||||||
./megaglest $@
|
./megaglest $@
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue