0103-tools-quilt-fix-perl-interpreter-line-20802.patch 2.4 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485868788899091929394
  1. From: Jo-Philipp Wich <jow@openwrt.org>
  2. Date: Mon, 26 Oct 2015 15:28:05 +0000
  3. Subject: tools: quilt: fix perl interpreter line (#20802)
  4. When using '/usr/bin/env' in a shebang it is not possible to specify
  5. additional flags for the interpreter. Remove '-w' switches and add
  6. 'use warnings;' instead.
  7. Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
  8. Backport of OpenWrt r47278
  9. diff --git a/tools/quilt/patches/000-relocatable.patch b/tools/quilt/patches/000-relocatable.patch
  10. index 9309fc426a67bd42172a3628fb67efb6569a1b47..aedb914c2995401e8b6b6b4b7bea9d9553142fa8 100644
  11. --- a/tools/quilt/patches/000-relocatable.patch
  12. +++ b/tools/quilt/patches/000-relocatable.patch
  13. @@ -28,7 +28,15 @@
  14. export QUILTRC
  15. --- a/quilt/scripts/edmail.in
  16. +++ b/quilt/scripts/edmail.in
  17. -@@ -29,7 +29,7 @@ BEGIN {
  18. +@@ -1,4 +1,6 @@
  19. +-#! @PERL@ -w
  20. ++#! @PERL@
  21. ++
  22. ++use warnings;
  23. +
  24. + # RFCs important for this script:
  25. + #
  26. +@@ -29,7 +31,7 @@ BEGIN {
  27. }
  28. setlocale(LC_MESSAGES, "");
  29. @@ -69,7 +77,15 @@
  30. : ${LC_MESSAGES:=$LANG}
  31. --- a/quilt/scripts/remove-trailing-ws.in
  32. +++ b/quilt/scripts/remove-trailing-ws.in
  33. -@@ -31,7 +31,7 @@ BEGIN {
  34. +@@ -1,4 +1,6 @@
  35. +-#! @PERL@ -w
  36. ++#! @PERL@
  37. ++
  38. ++use warnings;
  39. +
  40. + # Remove trailing whitespace from modified lines in working files.
  41. + #
  42. +@@ -31,7 +33,7 @@ BEGIN {
  43. }
  44. setlocale(LC_MESSAGES, "");
  45. @@ -127,3 +143,43 @@
  46. . $QUILT_DIR/scripts/utilfns
  47. ensure_nolinks()
  48. +--- a/bin/guards.in
  49. ++++ b/bin/guards.in
  50. +@@ -1,4 +1,6 @@
  51. +-#!@PERL@ -w
  52. ++#!@PERL@
  53. ++
  54. ++use warnings;
  55. +
  56. + # This script is free software; you can redistribute it and/or modify
  57. + # it under the terms of the GNU General Public License version 2 as
  58. +--- a/compat/date.in
  59. ++++ b/compat/date.in
  60. +@@ -1,4 +1,6 @@
  61. +-#! @PERL@ -w
  62. ++#! @PERL@
  63. ++
  64. ++use warnings;
  65. +
  66. + # This script is free software; you can redistribute it and/or modify
  67. + # it under the terms of the GNU General Public License version 2 as
  68. +--- a/compat/getopt.in
  69. ++++ b/compat/getopt.in
  70. +@@ -1,4 +1,6 @@
  71. +-#! @PERL@ -w
  72. ++#! @PERL@
  73. ++
  74. ++use warnings;
  75. +
  76. + # This script is free software; you can redistribute it and/or modify
  77. + # it under the terms of the GNU General Public License version 2 as
  78. +--- a/quilt/scripts/dependency-graph.in
  79. ++++ b/quilt/scripts/dependency-graph.in
  80. +@@ -1,4 +1,6 @@
  81. +-#!@PERL@ -w
  82. ++#!@PERL@
  83. ++
  84. ++use warnings;
  85. +
  86. + # This script is free software; you can redistribute it and/or modify
  87. + # it under the terms of the GNU General Public License version 2 as