- up to 8.6.1; drop patches that look ancient

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

diff --git a/tk-norpath.patch b/tk-norpath.patch
index f0005badf128302019dd574ce4a6d0ec8021883d..f8221fe5a7824f29a4d50479e9244ff180cf74c6 100644 (file)
--- a/tk-norpath.patch
+++ b/tk-norpath.patch
@@ -12,14 +12,15 @@
  # support for embedded libraries on Darwin / Mac OS X
  DYLIB_INSTALL_DIR     = ${LIB_RUNTIME_DIR}
 
---- tk8.5.13/unix/tcl.m4.orig  2012-11-28 21:37:18.227295408 +0100
-+++ tk8.5.13/unix/tcl.m4       2012-11-28 21:38:22.233962299 +0100
-@@ -2103,7 +2103,7 @@
+--- tcl8.5.13/unix/tcl.m4.orig 2012-11-28 21:29:42.223960573 +0100
++++ tcl8.5.13/unix/tcl.m4      2012-11-28 21:31:03.440627511 +0100
+@@ -2050,7 +2050,7 @@
  
      AS_IF([test "${SHARED_BUILD}" = 1 -a "${SHLIB_SUFFIX}" != ""], [
          LIB_SUFFIX=${SHARED_LIB_SUFFIX}
--        MAKE_LIB='${SHLIB_LD} -o [$]@ ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}'
-+        MAKE_LIB='${SHLIB_LD} -o [$]@ ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS}'
+-        MAKE_LIB='${SHLIB_LD} -o [$]@ ${OBJS} ${TCL_SHLIB_LD_EXTRAS} ${SHLIB_LD_LIBS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}'
++        MAKE_LIB='${SHLIB_LD} -o [$]@ ${OBJS} ${TCL_SHLIB_LD_EXTRAS} ${SHLIB_LD_LIBS} ${TK_SHLIB_LD_EXTRAS}'
          AS_IF([test "${SHLIB_SUFFIX}" = ".dll"], [
              INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(BIN_INSTALL_DIR)/$(LIB_FILE)"'
              DLL_INSTALL_DIR="\$(BIN_INSTALL_DIR)"
+