diff -Nru fpc-2.6.0/debian/changelog fpc-2.6.0/debian/changelog --- fpc-2.6.0/debian/changelog 2014-03-20 18:39:45.000000000 +0000 +++ fpc-2.6.0/debian/changelog 2014-10-21 18:57:32.000000000 +0000 @@ -1,3 +1,12 @@ +fpc (2.6.0-9+rpi1+wsf1) wheezy-wsf; urgency=high + + * Binutils related changes backported from 2.6.2-3 to allow use with + raspberry pi foundation's binutils package. + + Remove conflicts with binutils-gold (Closes: Bug#717651) + + Use ld.bfd explicitly (Helps with: Bug#624525) + + -- Peter Michael Green Tue, 23 Jul 2013 21:48:50 +0000 + fpc (2.6.0-9+rpi1) wheezy-staging; urgency=low * Set compiler defaults for raspbian. diff -Nru fpc-2.6.0/debian/control fpc-2.6.0/debian/control --- fpc-2.6.0/debian/control 2013-04-13 23:02:43.000000000 +0000 +++ fpc-2.6.0/debian/control 2014-10-21 18:52:49.000000000 +0000 @@ -59,7 +59,6 @@ Suggests: fp-docs-2.6.0 (>= ${source:Upstream-Version}) Provides: fp-compiler Breaks: fp-compiler (<= 2.4.0-3), fp-utils-2.4.4 (<= 2.4.4-2), fp-utils-2.4.2 (<= 2.4.2-3) -Conflicts: binutils-gold Replaces: fp-compiler (<= 2.4.0-3), fp-utils-2.4.4 (<= 2.4.4-1) Description: Free Pascal - compiler The Free Pascal Compiler is an Object Pascal compiler supporting both Delphi diff -Nru fpc-2.6.0/debian/patches/series fpc-2.6.0/debian/patches/series --- fpc-2.6.0/debian/patches/series 2014-03-20 18:39:45.000000000 +0000 +++ fpc-2.6.0/debian/patches/series 2014-10-21 18:53:46.000000000 +0000 @@ -5,4 +5,5 @@ armhf-linker-path.diff fix-vfp-exceptions.diff fix-creating-help-index-on-read-only-file-system.diff +use-bfd-explicitly.diff raspbian.diff diff -Nru fpc-2.6.0/debian/patches/use-bfd-explicitly.diff fpc-2.6.0/debian/patches/use-bfd-explicitly.diff --- fpc-2.6.0/debian/patches/use-bfd-explicitly.diff 1970-01-01 00:00:00.000000000 +0000 +++ fpc-2.6.0/debian/patches/use-bfd-explicitly.diff 2014-10-21 18:52:49.000000000 +0000 @@ -0,0 +1,32 @@ +Description: Use ld.bfd explicitly + Freepascal is broken with ld.gold, previously we conflicted with binutils-gold + but that makes us uninstallable with the new binutils. + + So instead we take the approach of patching fpc to use ld.bfd directly +Author: Peter Michael Green +Bug-Debian: http://bugs.debian.org/620815 +Bug-Debian: http://bugs.debian.org/624525 +Bug-Debian: http://bugs.debian.org/717651 + +Index: fpc-2.6.2/fpcsrc/compiler/systems/t_linux.pas +=================================================================== +--- fpc-2.6.2.orig/fpcsrc/compiler/systems/t_linux.pas 2013-07-23 21:41:40.000000000 +0000 ++++ fpc-2.6.2/fpcsrc/compiler/systems/t_linux.pas 2013-07-24 00:38:25.000000000 +0000 +@@ -1031,7 +1031,7 @@ + if HasExports then + cmdstr:=cmdstr+' -E'; + +- success:=DoExec(FindUtil(utilsprefix+BinStr),CmdStr,true,false); ++ success:=DoExec(FindUtil(utilsprefix+BinStr)+'.bfd',CmdStr,true,false); + + { Create external .dbg file with debuginfo } + if success and (cs_link_separate_dbg_file in current_settings.globalswitches) then +@@ -1086,7 +1090,7 @@ + Replace(cmdstr,'$INIT',InitStr); + Replace(cmdstr,'$FINI',FiniStr); + Replace(cmdstr,'$SONAME',SoNameStr); +- success:=DoExec(FindUtil(utilsprefix+binstr),cmdstr,true,false); ++ success:=DoExec(FindUtil(utilsprefix+binstr)+'.bfd',cmdstr,true,false); + + { Strip the library ? } + if success and (cs_link_strip in current_settings.globalswitches) then