- up to 8.6.1; drop patches that look ancient

[packages/tk.git] / tk-opt_flags_pass_fix.patch

diff --git a/tk-opt_flags_pass_fix.patch b/tk-opt_flags_pass_fix.patch
index 6b1c2a35345a6c2819027ff3dd70b3a859355fcf..1534f408c493a5cc4f0e1d1bf90828712c65e30a 100644 (file)
--- a/tk-opt_flags_pass_fix.patch
+++ b/tk-opt_flags_pass_fix.patch
@@ -1,12 +1,29 @@
-diff -Nru tk8.3.2/unix/tcl.m4 tk8.3.2.new/unix/tcl.m4
---- tk8.3.2/unix/tcl.m4        Tue Aug  8 21:19:32 2000
-+++ tk8.3.2.new/unix/tcl.m4    Thu Nov 16 22:01:37 2000
-@@ -587,7 +587,7 @@
-     ECHO_VERSION='`echo ${VERSION}`'
+--- tcl8.6.1/unix/tcl.m4~      2013-09-19 22:17:13.000000000 +0200
++++ tcl8.6.1/unix/tcl.m4       2014-05-31 19:44:20.670186134 +0200
+@@ -1114,7 +1114,7 @@
      TCL_LIB_VERSIONS_OK=ok
      CFLAGS_DEBUG=-g
--    CFLAGS_OPTIMIZE=-O
-+    CFLAGS_OPTIMIZE="${CFLAGS}"
      AS_IF([test "$GCC" = yes], [
-       CFLAGS_WARNING="-Wall -Wno-implicit-int"
-     ], [CFLAGS_WARNING=""])
+-      CFLAGS_OPTIMIZE=-O2
++      CFLAGS_OPTIMIZE=${OPTFLAGS}
+       CFLAGS_WARNING="-Wall"
+     ], [
+       CFLAGS_OPTIMIZE=-O
+@@ -1409,7 +1409,7 @@
+           SHLIB_CFLAGS="-fPIC"
+           SHLIB_SUFFIX=".so"
+ 
+-          CFLAGS_OPTIMIZE="-O2"
++          CFLAGS_OPTIMIZE="${OPTFLAGS}"
+           # egcs-2.91.66 on Redhat Linux 6.0 generates lots of warnings
+           # when you inline the string and math operations.  Turn this off to
+           # get rid of the warnings.
+@@ -1507,7 +1507,7 @@
+               CFLAGS_OPTIMIZE="-O0"
+               ;;
+           *)
+-              CFLAGS_OPTIMIZE="-O2"
++              CFLAGS_OPTIMIZE="${OPTFLAGS}"
+               ;;
+           esac
+           AS_IF([test "${TCL_THREADS}" = "1"], [