300-001_ld_makefile_patch.patch 2.0 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152
  1. #!/bin/sh -e
  2. ## 001_ld_makefile_patch.dpatch
  3. ##
  4. ## All lines beginning with `## DP:' are a description of the patch.
  5. ## DP: Description: correct where ld scripts are installed
  6. ## DP: Author: Chris Chimelis <chris@debian.org>
  7. ## DP: Upstream status: N/A
  8. ## DP: Date: ??
  9. if [ $# -ne 1 ]; then
  10. echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
  11. exit 1
  12. fi
  13. [ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
  14. patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
  15. case "$1" in
  16. -patch) patch $patch_opts -p1 < $0;;
  17. -unpatch) patch $patch_opts -p1 -R < $0;;
  18. *)
  19. echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
  20. exit 1;;
  21. esac
  22. exit 0
  23. @DPATCH@
  24. diff -urNad /home/james/debian/packages/binutils/binutils-2.14.90.0.6/ld/Makefile.am binutils-2.14.90.0.6/ld/Makefile.am
  25. --- /home/james/debian/packages/binutils/binutils-2.14.90.0.6/ld/Makefile.am 2003-08-21 16:28:48.000000000 +0100
  26. +++ binutils-2.14.90.0.6/ld/Makefile.am 2003-09-10 23:12:09.000000000 +0100
  27. @@ -19,7 +19,7 @@
  28. # We put the scripts in the directory $(scriptdir)/ldscripts.
  29. # We can't put the scripts in $(datadir) because the SEARCH_DIR
  30. # directives need to be different for native and cross linkers.
  31. -scriptdir = $(tooldir)/lib
  32. +scriptdir = $(libdir)
  33. EMUL = @EMUL@
  34. EMULATION_OFILES = @EMULATION_OFILES@
  35. diff -urNad /home/james/debian/packages/binutils/binutils-2.14.90.0.6/ld/Makefile.in binutils-2.14.90.0.6/ld/Makefile.in
  36. --- /home/james/debian/packages/binutils/binutils-2.14.90.0.6/ld/Makefile.in 2003-08-21 16:28:48.000000000 +0100
  37. +++ binutils-2.14.90.0.6/ld/Makefile.in 2003-09-10 23:12:09.000000000 +0100
  38. @@ -128,7 +128,7 @@
  39. # We put the scripts in the directory $(scriptdir)/ldscripts.
  40. # We can't put the scripts in $(datadir) because the SEARCH_DIR
  41. # directives need to be different for native and cross linkers.
  42. -scriptdir = $(tooldir)/lib
  43. +scriptdir = $(libdir)
  44. EMUL = @EMUL@
  45. EMULATION_OFILES = @EMULATION_OFILES@