paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-14 10:29:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Fix bug ID #36484: macos forbids loading unversioned library

Browse Source 
git-svn-id: trunk@43798 -
This commit is contained in:
michael 2019-12-27 11:02:30 +00:00
parent 94d222ba69
commit 0485f59cad
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/openssl/src/openssl.pas
View File

@ -109,7 +109,7 @@ var
{ ADD NEW ONES WHEN THEY APPEAR! { ADD NEW ONES WHEN THEY APPEAR!
Always make .so/dylib first, then versions, in descending order! Always make .so/dylib first, then versions, in descending order!
Add "." .before the version, first is always just "" } Add "." .before the version, first is always just "" }
DLLVersions: array[1..16] of string = ('', '.1.0.6', '.1.0.5', '.1.0.4', '.1.0.3', DLLVersions: array[1..17] of string = ('', '.1.1', '.1.0.6', '.1.0.5', '.1.0.4', '.1.0.3',
'.1.0.2', '.1.0.1','.1.0.0','.0.9.8', '.1.0.2', '.1.0.1','.1.0.0','.0.9.8',
'.0.9.7', '.0.9.6', '.0.9.5', '.0.9.4', '.0.9.7', '.0.9.6', '.0.9.5', '.0.9.4',
'.0.9.3', '.0.9.2', '.0.9.1'); '.0.9.3', '.0.9.2', '.0.9.1');
@ -5623,6 +5623,10 @@ Function LoadLibraries : Boolean;
begin begin
Result:=False; Result:=False;
{$IFDEF DARWIN}
// Mac OS no longer allows you to load the unversioned one. Bug ID 36484.
DLLVERSIONS[1]:=DLLVERSIONS[2];
{$ENDIF}
SSLUtilHandle := LoadLib(DLLUtilName); SSLUtilHandle := LoadLib(DLLUtilName);
SSLLibHandle := LoadLib(DLLSSLName); SSLLibHandle := LoadLib(DLLSSLName);
{$IFDEF MSWINDOWS} {$IFDEF MSWINDOWS}