From 1c6eae3cea946d2a7fd0eb81bb135e0fa80dc182 Mon Sep 17 00:00:00 2001
From: Juha <juha@lazarus-ide.org>
Date: Sat, 20 Apr 2024 06:11:01 +0300
Subject: [PATCH] StartLazarus: Fix after earlier refactoring. PackageDefs
 somehow requires cthreads.

---
 ide/lazbuild.lpr     | 5 ++++-
 ide/startlazarus.lpi | 9 +++------
 ide/startlazarus.lpr | 6 ++++++
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/ide/lazbuild.lpr b/ide/lazbuild.lpr
index e5f7f71b3f..9ccf5aa4de 100644
--- a/ide/lazbuild.lpr
+++ b/ide/lazbuild.lpr
@@ -24,7 +24,10 @@ program lazbuild;
 {$mode objfpc}{$H+}
 
 uses
-  {$IFDEF unix}
+  {$IF defined(HASAMIGA)}
+  athreads,
+  {$ENDIF}
+  {$IF defined(UNIX)}
   cthreads,
   {$ENDIF}
   Classes, SysUtils, Math, CustApp, System.UITypes,
diff --git a/ide/startlazarus.lpi b/ide/startlazarus.lpi
index 0355d4be8e..d731960e85 100644
--- a/ide/startlazarus.lpi
+++ b/ide/startlazarus.lpi
@@ -32,12 +32,12 @@
         </Mode0>
       </Modes>
     </RunParams>
-    <RequiredPackages Count="5">
+    <RequiredPackages Count="4">
       <Item1>
-        <PackageName Value="IdeConfig"/>
+        <PackageName Value="IdePackager"/>
       </Item1>
       <Item2>
-        <PackageName Value="SynEdit"/>
+        <PackageName Value="IdeConfig"/>
       </Item2>
       <Item3>
         <PackageName Value="IDEIntf"/>
@@ -45,9 +45,6 @@
       <Item4>
         <PackageName Value="CodeTools"/>
       </Item4>
-      <Item5>
-        <PackageName Value="LCL"/>
-      </Item5>
     </RequiredPackages>
     <Units Count="2">
       <Unit0>
diff --git a/ide/startlazarus.lpr b/ide/startlazarus.lpr
index b3e93286d4..d688627294 100644
--- a/ide/startlazarus.lpr
+++ b/ide/startlazarus.lpr
@@ -31,6 +31,12 @@ program StartLazarus;
 {$mode objfpc}{$H+}
 
 uses
+  {$IF defined(HASAMIGA)}
+  athreads,
+  {$ENDIF}
+  {$IF defined(UNIX)}
+  cthreads,
+  {$ENDIF}
   redirect_stderr,
   Interfaces, SysUtils,
   Forms,