patch-Configure 1.6 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465
  1. --- perl-5.12.3.orig/Configure 2011-01-09 21:20:52.000000000 +0100
  2. +++ perl-5.12.3/Configure 2011-03-19 20:44:59.000000000 +0100
  3. @@ -5164,11 +5164,11 @@ default|recommended)
  4. # is to add the flag to the flags passed to the compiler at link time,
  5. # as that way the compiler can do the right implementation dependant
  6. # thing. (NWC)
  7. - case "$gccversion" in
  8. - ?*) set stack-protector -fstack-protector
  9. - eval $checkccflag
  10. - ;;
  11. - esac
  12. + #case "$gccversion" in
  13. + #?*) set stack-protector -fstack-protector
  14. + # eval $checkccflag
  15. + # ;;
  16. + #esac
  17. ;;
  18. esac
  19. @@ -5308,14 +5308,14 @@ case "$ldflags" in
  20. *) dflt="$ldflags";;
  21. esac
  22. # See note above about -fstack-protector
  23. -case "$ccflags" in
  24. -*-fstack-protector*)
  25. - case "$dflt" in
  26. - *-fstack-protector*) ;; # Don't add it again
  27. - *) dflt="$dflt -fstack-protector" ;;
  28. - esac
  29. - ;;
  30. -esac
  31. +#case "$ccflags" in
  32. +#*-fstack-protector*)
  33. +# case "$dflt" in
  34. +# *-fstack-protector*) ;; # Don't add it again
  35. +# *) dflt="$dflt -fstack-protector" ;;
  36. +# esac
  37. +# ;;
  38. +#esac
  39. : Try to guess additional flags to pick up local libraries.
  40. for thislibdir in $libpth; do
  41. @@ -8107,14 +8107,14 @@ EOM
  42. ''|' ') dflt='none' ;;
  43. esac
  44. - case "$ldflags" in
  45. - *-fstack-protector*)
  46. - case "$dflt" in
  47. - *-fstack-protector*) ;; # Don't add it again
  48. - *) dflt="$dflt -fstack-protector" ;;
  49. - esac
  50. - ;;
  51. - esac
  52. +# case "$ldflags" in
  53. +# *-fstack-protector*)
  54. +# case "$dflt" in
  55. +# *-fstack-protector*) ;; # Don't add it again
  56. +# *) dflt="$dflt -fstack-protector" ;;
  57. +# esac
  58. +# ;;
  59. +# esac
  60. rp="Any special flags to pass to $ld to create a dynamically loaded library?"