File fpc-fix-library-paths-on-aarch64.patch of Package fpc

Overview Repositories Revisions Requests Users Attributes Meta

File fpc-fix-library-paths-on-aarch64.patch of Package fpc (Revision ba2adf8659107e51355bd8ac496f3ecc)

Currently displaying revision ba2adf8659107e51355bd8ac496f3ecc , Show latest

diff -Nru fpcbuild-3.2.0.orig/fpcsrc/compiler/systems/t_linux.pas fpcbuild-3.2.0/fpcsrc/compiler/systems/t_linux.pas
--- fpcbuild-3.2.0.orig/fpcsrc/compiler/systems/t_linux.pas	2019-12-05 21:11:43.000000000 +0100
+++ fpcbuild-3.2.0/fpcsrc/compiler/systems/t_linux.pas	2020-06-25 18:33:04.362536867 +0200
@@ -142,8 +142,15 @@
         LibrarySearchPath.AddLibraryPath(sysrootpath,'=/lib64;=/usr/lib64;=/usr/X11R6/lib64',true)
       else
         LibrarySearchPath.AddLibraryPath(sysrootpath,'=/lib64;=/usr/lib/powerpc64le-linux-gnu;=/usr/X11R6/powerpc64le-linux-gnu',true);
-{$else powerpc64}
+{$else}
+{$ifdef aarch64}
+      LibrarySearchPath.AddLibraryPath(sysrootpath,'=/usr/lib',true);
+      LibrarySearchPath.AddLibraryPath(sysrootpath,'=/lib',true);
+      LibrarySearchPath.AddLibraryPath(sysrootpath,'=/usr/lib64',true);
+      LibrarySearchPath.AddLibraryPath(sysrootpath,'=/lib64',true);
+{$else}
       LibrarySearchPath.AddLibraryPath(sysrootpath,'=/lib;=/usr/lib;=/usr/X11R6/lib',true);
+{$endif aarch64}
 {$endif powerpc64}
 {$endif x86_64}
 
@@ -223,7 +230,7 @@
 {$endif arm}
 
 {$ifdef aarch64}
-const defdynlinker='/lib/ld-linux-aarch64.so.1';
+const defdynlinker='/lib64/ld-linux-aarch64.so.1';
 {$endif aarch64}
 
 {$ifdef mips}

Places

File fpc-fix-library-paths-on-aarch64.patch of Package fpc (Revision ba2adf8659107e51355bd8ac496f3ecc)

Places