[Pkg-pascal-devel] Bug#800811: fpc: FTBFS on i386,...

[Edmund Grimley Evans]

To summarise, if you were doing an rc1+dfsg-2 without arm64, this
(untested) might be the diff from rc1+dfsg-1. However, rc2 should be
out tonight, so you might want to wait for that.

--- a/debian/rules
+++ b/debian/rules
@@ -131,9 +131,9 @@
 ifeq ($(CPU_TARGET),arm)
   DEBIANARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
   ifeq ($(DEBIANARCH),arm)
-    CYCLEOPTS:=OPT='@${CURDIR}/${DEB_HOST_FPC_OPT} -dFPC_OARM'
+    CYCLEOPTS:=OPT='@${CURDIR}/${DEB_HOST_FPC_OPT} -dFPC_OARM' OPTLEVEL1=-O-
   else
-    CYCLEOPTS:=OPT='@${CURDIR}/${DEB_HOST_FPC_OPT} -dFPC_$(DEBIANARCH)'
+    CYCLEOPTS:=OPT='@${CURDIR}/${DEB_HOST_FPC_OPT}
-dFPC_$(DEBIANARCH)' OPTLEVEL1=-O-
   endif
 else
   CYCLEOPTS:=OPT='@${CURDIR}/${DEB_HOST_FPC_OPT}'
--- a/fpcsrc/compiler/systems/t_linux.pas
+++ b/fpcsrc/compiler/systems/t_linux.pas
@@ -145,6 +145,18 @@
     LibrarySearchPath.AddPath(sysrootpath,'/usr/lib/arm-linux-gnueabi',true);
 {$endif}
 {$endif arm}
+{$ifdef i386}
+  if not Dontlinkstdlibpath Then
+    LibrarySearchPath.AddPath(sysrootpath,'/usr/lib/i386-linux-gnu',true);
+{$endif i386}
+{$ifdef powerpc}
+  if not Dontlinkstdlibpath Then
+    LibrarySearchPath.AddPath(sysrootpath,'/usr/lib/powerpc-linux-gnu',true);
+{$endif powerpc}
+{$ifdef powerpc64}
+  if not Dontlinkstdlibpath Then
+    LibrarySearchPath.AddPath(sysrootpath,'/usr/lib/powerpc64-linux-gnu',true);
+{$endif powerpc64}
 {$ifdef x86_64}
   if not Dontlinkstdlibpath Then
     LibrarySearchPath.AddPath(sysrootpath,'/usr/lib/x86_64-linux-gnu',true);