From c0b2f99585d0528005954dabdecf1d091674c0a8 Mon Sep 17 00:00:00 2001
From: pierre <pierre@freepascal.org>
Date: Tue, 2 Feb 2021 23:02:36 +0000
Subject: [PATCH]   * Merging of commit 48227
 ------------------------------------------------------------------------
 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 -
---
 packages/rtl-extra/fpmake.pp          | 12 ++++++++++--
 packages/rtl-extra/src/bsd/osdefs.inc |  5 +++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/packages/rtl-extra/fpmake.pp b/packages/rtl-extra/fpmake.pp
index 54b256aff4..aa116a6bc6 100644
--- a/packages/rtl-extra/fpmake.pp
+++ b/packages/rtl-extra/fpmake.pp
@@ -27,8 +27,6 @@ Const
   WinsockOSes   = [win32,win64,wince,os2,emx,netware,netwlibc];
   WinSock2OSes  = [win32,win64,wince];
   SocketsOSes   = UnixLikes+AllAmigaLikeOSes+[netware,netwlibc,os2,emx,wince,win32,win64];
-  Socksyscall   = [beos,freebsd,haiku,linux,netbsd,openbsd,dragonfly];
-  Socklibc  = unixlikes-socksyscall;
   gpmOSes = [Linux,Android];
   AllTargetsextra = ObjectsOSes + UComplexOSes + MatrixOSes+
                       SerialOSes +PrinterOSes+SocketsOSes+gpmOSes;
@@ -36,6 +34,7 @@ Const
 Var
   P : TPackage;
   T : TTarget;
+  Socksyscall, Socklibc : set of Tos;
 
 begin
   With Installer do
@@ -51,6 +50,15 @@ begin
     if Defaults.CPU=jvm then
       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.Description := 'Rtl-extra, RTL not needed for bootstrapping';
     P.NeedLibC:= false;
diff --git a/packages/rtl-extra/src/bsd/osdefs.inc b/packages/rtl-extra/src/bsd/osdefs.inc
index 006f83e4b7..11dac66888 100644
--- a/packages/rtl-extra/src/bsd/osdefs.inc
+++ b/packages/rtl-extra/src/bsd/osdefs.inc
@@ -27,4 +27,9 @@
 {$ifdef darwin}
   {$define FPC_USE_LIBC}
 {$endif}
+{$ifdef openbsd}
+  {$ifndef FPC_USE_SYSCALL}
+    {$define FPC_USE_LIBC}
+  {$endif}
+{$endif}