300-001_ld_makefile_patch.patch 1.9 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354
  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 <[email protected]>
  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. Index: binutils-2.18/ld/Makefile.am
  25. ===================================================================
  26. --- binutils-2.18.orig/ld/Makefile.am 2007-06-28 09:19:34.837940280 +0200
  27. +++ binutils-2.18/ld/Makefile.am 2007-06-28 09:19:35.795794664 +0200
  28. @@ -18,7 +18,7 @@
  29. # We put the scripts in the directory $(scriptdir)/ldscripts.
  30. # We can't put the scripts in $(datadir) because the SEARCH_DIR
  31. # directives need to be different for native and cross linkers.
  32. -scriptdir = $(tooldir)/lib
  33. +scriptdir = $(libdir)
  34. EMUL = @EMUL@
  35. EMULATION_OFILES = @EMULATION_OFILES@
  36. Index: binutils-2.18/ld/Makefile.in
  37. ===================================================================
  38. --- binutils-2.18.orig/ld/Makefile.in 2007-06-28 09:19:34.844939216 +0200
  39. +++ binutils-2.18/ld/Makefile.in 2007-06-28 09:19:35.796794512 +0200
  40. @@ -287,7 +287,7 @@
  41. # We put the scripts in the directory $(scriptdir)/ldscripts.
  42. # We can't put the scripts in $(datadir) because the SEARCH_DIR
  43. # directives need to be different for native and cross linkers.
  44. -scriptdir = $(tooldir)/lib
  45. +scriptdir = $(libdir)
  46. BASEDIR = $(srcdir)/..
  47. BFDDIR = $(BASEDIR)/bfd
  48. INCDIR = $(BASEDIR)/include