paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-22 01:52:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Merging of commit 48227

Browse Source 
------------------------------------------------------------------------
r48227 | pierre | 2021-01-20 12:39:21 +0000 (Wed, 20 Jan 2021) | 1 line

Fix compilation for OpenBSD target after changes that use libc by default
------------------------------------------------------------------------
--- Merging r48227 into '.':
U    packages/rtl-extra/fpmake.pp
U    packages/rtl-extra/src/bsd/osdefs.inc
--- Recording mergeinfo for merge of r48227 into '.':
 U   .

git-svn-id: branches/fixes_3_2@48503 -
This commit is contained in:
pierre 2021-02-02 23:02:36 +00:00
parent a61d4b3eb6
commit c0b2f99585
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/rtl-extra/fpmake.pp
View File

@ -27,8 +27,6 @@ Const
WinsockOSes = [win32,win64,wince,os2,emx,netware,netwlibc]; WinsockOSes = [win32,win64,wince,os2,emx,netware,netwlibc];
WinSock2OSes = [win32,win64,wince]; WinSock2OSes = [win32,win64,wince];
SocketsOSes = UnixLikes+AllAmigaLikeOSes+[netware,netwlibc,os2,emx,wince,win32,win64]; SocketsOSes = UnixLikes+AllAmigaLikeOSes+[netware,netwlibc,os2,emx,wince,win32,win64];
Socksyscall = [beos,freebsd,haiku,linux,netbsd,openbsd,dragonfly];
Socklibc = unixlikes-socksyscall;
gpmOSes = [Linux,Android]; gpmOSes = [Linux,Android];
AllTargetsextra = ObjectsOSes + UComplexOSes + MatrixOSes+ AllTargetsextra = ObjectsOSes + UComplexOSes + MatrixOSes+
SerialOSes +PrinterOSes+SocketsOSes+gpmOSes; SerialOSes +PrinterOSes+SocketsOSes+gpmOSes;
@ -36,6 +34,7 @@ Const
Var Var
P : TPackage; P : TPackage;
T : TTarget; T : TTarget;
Socksyscall, Socklibc : set of Tos;
begin begin
With Installer do With Installer do
@ -51,6 +50,15 @@ begin
if Defaults.CPU=jvm then if Defaults.CPU=jvm then
P.OSes := P.OSes - [java,android]; P.OSes := P.OSes - [java,android];
Socksyscall := [beos,freebsd,haiku,linux,netbsd,dragonfly];
Socklibc := unixlikes-socksyscall;
{$ifdef FPC_USE_SYSCALL}
if Defaults.OS=openbsd then
begin
system.include(Socksyscall,openbsd);
system.exclude(Socklibc,openbsd);
end;
{$endif}
P.Email := ''; P.Email := '';
P.Description := 'Rtl-extra, RTL not needed for bootstrapping'; P.Description := 'Rtl-extra, RTL not needed for bootstrapping';
P.NeedLibC:= false; P.NeedLibC:= false;

5
packages/rtl-extra/src/bsd/osdefs.inc
View File

@ -27,4 +27,9 @@
{$ifdef darwin} {$ifdef darwin}
{$define FPC_USE_LIBC} {$define FPC_USE_LIBC}
{$endif} {$endif}
{$ifdef openbsd}
{$ifndef FPC_USE_SYSCALL}
{$define FPC_USE_LIBC}
{$endif}
{$endif}