We thought a dynamic linker path had been agreed across distros but when
it actually came to pushing stuff upstream a load of new people brought
their paintbrushes to the bikeshed and the dynamic linker path was
changed to /lib/ld-linux-armhf.so.3 . The attatched patch updates the
fpc package to reflect that, fixes a slight typo in the changelog and
updates the date in the changelog trailer to the time of the last change.
I intend to wait a while before pushing this change upstream incase
there are further developments (hence why I have done it as a seperate
patch rather than modifying armhf.diff).
diff -urN fpc-2.6.0.svn/debian/changelog fpc-2.6.0.svn.new/debian/changelog
--- fpc-2.6.0.svn/debian/changelog 2012-04-03 09:43:10.000000000 +0000
+++ fpc-2.6.0.svn.new/debian/changelog 2012-04-21 12:13:37.000000000 +0000
@@ -5,11 +5,13 @@
possible to bootstrap with a starting compiler from another arm variant.
+ Use DEB_*_ARCH_CPU to reduce the ammount of special casing we
require when setting CPU_SOURCE and CPU_TARGET.
- + debian/control: add armhf to architecture list.
+ - debian/control: add armhf to architecture list.
- debian/patches/armhf.diff: main changes for port, based on patch
submitted upstream with adjustments to backport to 2.6.0
- debian/patches/regenerate_messages.diff: regenerate messages file
to add new message introduced by armhf.diff
+ - armhf-linker-path.diff: change dynamic linker path to reflect new
+ cross-distro agreement.
* fixups to clean target in debian/rules:
- Don't remove .pc since we aren't removing the patches anymore
(fixes issues where quilt doesn't think the patches are applied even
@@ -19,7 +21,7 @@
- Cleanup install-source-stamp
- Cleanup various generated files in debian directory
- -- Peter Michael Green <plugw...@p10link.net> Mon, 26 Mar 2012 01:30:00 +0100
+ -- Peter Michael Green <plugw...@p10link.net> Sat, 21 Apr 2012 13:13:00 +0100
fpc (2.6.0-2) unstable; urgency=low
diff -urN fpc-2.6.0.svn/debian/patches/armhf-linker-path.diff fpc-2.6.0.svn.new/debian/patches/armhf-linker-path.diff
--- fpc-2.6.0.svn/debian/patches/armhf-linker-path.diff 1970-01-01 00:00:00.000000000 +0000
+++ fpc-2.6.0.svn.new/debian/patches/armhf-linker-path.diff 2012-04-21 12:10:25.000000000 +0000
@@ -0,0 +1,13 @@
+Index: fpc-2.6.0.svn.new/fpcsrc/compiler/systems/t_linux.pas
+===================================================================
+--- fpc-2.6.0.svn.new.orig/fpcsrc/compiler/systems/t_linux.pas 2012-04-21 11:47:00.000000000 +0000
++++ fpc-2.6.0.svn.new/fpcsrc/compiler/systems/t_linux.pas 2012-04-21 12:10:16.000000000 +0000
+@@ -186,7 +186,7 @@
+
+ {$ifdef arm}
+ {$ifdef FPC_ARMHF}
+- defdynlinker:='/lib/arm-linux-gnueabihf/ld-linux.so.3';
++ defdynlinker:='/lib/ld-linux-armhf.so.3';
+ {$else FPC_ARMHF}
+ {$ifdef FPC_ARMEL}
+ defdynlinker:='/lib/ld-linux.so.3';
diff -urN fpc-2.6.0.svn/debian/patches/series fpc-2.6.0.svn.new/debian/patches/series
--- fpc-2.6.0.svn/debian/patches/series 2012-04-03 09:41:12.000000000 +0000
+++ fpc-2.6.0.svn.new/debian/patches/series 2012-04-21 12:09:51.000000000 +0000
@@ -2,3 +2,4 @@
armhf.diff
regenerate_messages.diff
fix-FPCDIR-in-fpcmake.diff
+armhf-linker-path.diff
