Some library scanner improvements.

LongDirtyAnimAlf · Jul 17, 2024 · ee9d6aa · ee9d6aa
1 parent 5b2a4b5
commit ee9d6aa
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 4 deletions.
diff --git a/fpcuptools/libraryscanner/scannercmd.lpi b/fpcuptools/libraryscanner/scannercmd.lpi
@@ -94,6 +94,32 @@
           </Linking>
         </CompilerOptions>
       </Item>
+      <Item Name="OpenBSDAMD64">
+        <CompilerOptions>
+          <Version Value="11"/>
+          <PathDelim Value="\"/>
+          <Target>
+            <Filename Value="bin\$NameOnly($(ProjFile))-$(TargetCPU)-$(TargetOS)"/>
+          </Target>
+          <SearchPaths>
+            <IncludeFiles Value="$(ProjOutDir)"/>
+            <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+          </SearchPaths>
+          <CodeGeneration>
+            <TargetCPU Value="x86_64"/>
+            <TargetOS Value="openbsd"/>
+            <Optimizations>
+              <OptimizationLevel Value="2"/>
+            </Optimizations>
+          </CodeGeneration>
+          <Linking>
+            <Debugging>
+              <GenerateDebugInfo Value="False"/>
+              <UseLineInfoUnit Value="False"/>
+            </Debugging>
+          </Linking>
+        </CompilerOptions>
+      </Item>
     </BuildModes>
     <PublishOptions>
       <Version Value="2"/>

diff --git a/fpcuptools/libraryscanner/scannercore.pas b/fpcuptools/libraryscanner/scannercore.pas
@@ -111,12 +111,14 @@ implementation
   );
   {$endif}
 
-  {$if defined(FreeBSD) OR defined(NetBSD) OR defined(OenBSD) OR defined(DragonFly)}
-  BSDSEARCHDIRS : array [0..9] of string = (
+  {$if defined(FreeBSD) OR defined(NetBSD) OR defined(OpenBSD) OR defined(DragonFly)}
+  BSDSEARCHDIRS : array [0..11] of string = (
   '/lib',
   '/libexec',
   '/usr/lib',
+  '/usr/libexec',
   '/usr/pkg/lib',
+  '/usr/X11R6/lib',
   '/usr/X11R7/lib',
   '/usr/local/lib',
   '/usr/local/lib/qt5',
@@ -137,7 +139,7 @@ implementation
   DYNLINKV2='ld-*.so.2';
   DYNLINKV3='ld-*.so.3';
   {$else}
-  {$if defined(FreeBSD) OR defined(NetBSD) OR defined(OenBSD) OR defined(DragonFly)}
+  {$if defined(FreeBSD) OR defined(NetBSD) OR defined(OpenBSD) OR defined(DragonFly)}
   DYNLINKV1='ld-elf.so.1';
   DYNLINKV2='ld-elf.so.2';
   DYNLINKV3='ld-elf.so.3';
@@ -409,11 +411,12 @@ function GetSourceCPUOS:string;
 function GetStartupObjects:string;
 const
   LINKFILE='crtbegin.o';
-  SEARCHDIRS : array [0..5] of string = (
+  SEARCHDIRS : array [0..6] of string = (
     '/usr/local/lib/',
     '/usr/lib/',
     '/usr/local/lib/gcc/',
     '/usr/lib/gcc/',
+    '/usr/lib/gcc-lib/',
     '/lib/gcc/',
     '/lib/'
     );

diff --git a/installscripts/openbsd_xfce.sh b/installscripts/openbsd_xfce.sh
@@ -0,0 +1,24 @@
+sudo pkg_add at-spi2-core
+
+sudo pkg_add install xfce
+sudo pkg_add install xfce-extras
+sudo pkg_add install xfce-desktop
+
+sudo sed -i 's/xconsole/#xconsole/' /etc/X11/xenodm/Xsetup_0
+
+sudo pkg_add xfce4-power-manager
+
+sudo pkg_add install xdg-user-dirs
+xdg-user-dirs-update
+
+rcctl enable messagebus
+rcctl start messagebus
+rcctl enable apmd
+rcctl start apmd
+
+# this must be done for the local user
+touch .xsession
+# echo 'exec ck-launch-session xfce4-session' > .xsession
+echo 'exec xfce4-session' > .xsession
+ln -s .xsession .xinitrc
+xdg-user-dirs-update