lang/tcl8[5-7], x11-toolkits/tk8[5-7]: fix build with WITH_LLVM_BINUTILS

PR:		270768
Reported by:	emaste

6 files changed, 51 insertions, 2 deletions

diff --git a/lang/tcl85/files/patch-Makefile.in b/lang/tcl85/files/patch-Makefile.in
index a12d76e18109..aed41d3016ed 100644
--- a/lang/tcl85/files/patch-Makefile.in
+++ b/lang/tcl85/files/patch-Makefile.in
@@ -9,6 +9,15 @@
  
  # Path to the private tcl header dir:
  PRIVATE_INCLUDE_DIR	= @PRIVATE_INCLUDE_DIR@
+@@ -149,7 +151,7 @@ SHELL			= @MAKEFILE_SHELL@
+ # distribution, which is slower but guaranteed to work.
+ 
+ INSTALL_STRIP_PROGRAM   = -s
+-INSTALL_STRIP_LIBRARY   = -S -x
++INSTALL_STRIP_LIBRARY   = -S --strip-unneeded
+ 
+ INSTALL			= $(SHELL) $(UNIX_DIR)/install-sh -c
+ INSTALL_PROGRAM		= ${INSTALL}
 @@ -546,7 +548,7 @@ SRCS = $(GENERIC_SRCS) $(TOMMATH_SRCS) $(UNIX_SRCS) $(
  
  all: binaries libraries doc
diff --git a/lang/tcl86/files/patch-unix-Makefile.in b/lang/tcl86/files/patch-unix-Makefile.in
index 8317abb8db62..129c0afce1be 100644
--- a/lang/tcl86/files/patch-unix-Makefile.in
+++ b/lang/tcl86/files/patch-unix-Makefile.in
@@ -22,6 +22,15 @@
  
  # Package search path.
  TCL_PACKAGE_PATH	= @TCL_PACKAGE_PATH@
+@@ -151,7 +153,7 @@ SHELL			= @MAKEFILE_SHELL@
+ # distribution, which is slower but guaranteed to work.
+ 
+ INSTALL_STRIP_PROGRAM	= -s
+-INSTALL_STRIP_LIBRARY	= -S -x
++INSTALL_STRIP_LIBRARY	= -S --strip-unneeded
+ 
+ INSTALL			= $(SHELL) $(UNIX_DIR)/install-sh -c
+ INSTALL_PROGRAM		= ${INSTALL}
 @@ -713,9 +715,9 @@ SRCS = $(GENERIC_SRCS) $(UNIX_SRCS) $(NOTIFY_SRCS) \
  # Start of rules
  #--------------------------------------------------------------------------
diff --git a/lang/tcl87/files/patch-unix_Makefile.in b/lang/tcl87/files/patch-unix_Makefile.in
index 68fceb6b0160..2bc20856232a 100644
--- a/lang/tcl87/files/patch-unix_Makefile.in
+++ b/lang/tcl87/files/patch-unix_Makefile.in
@@ -9,6 +9,15 @@
  
  # Directory in which to install bundled packages:
  PACKAGE_DIR		= @PACKAGE_DIR@
+@@ -151,7 +151,7 @@ SHELL			= @MAKEFILE_SHELL@
+ # distribution, which is slower but guaranteed to work.
+ 
+ INSTALL_STRIP_PROGRAM	= -s
+-INSTALL_STRIP_LIBRARY	= -S -x
++INSTALL_STRIP_LIBRARY	= -S --strip-unneeded
+ 
+ INSTALL			= $(SHELL) $(UNIX_DIR)/install-sh -c
+ INSTALL_PROGRAM		= ${INSTALL}
 @@ -1003,30 +1003,23 @@ install-binaries: binaries
  	@EXTRA_INSTALL_BINARIES@
  	@echo "Installing pkg-config file to $(LIB_INSTALL_DIR)/pkgconfig/"
diff --git a/x11-toolkits/tk85/files/patch-unix-Makefile.in b/x11-toolkits/tk85/files/patch-unix-Makefile.in
index 90938d9ad226..8b7cd64f3393 100644
--- a/x11-toolkits/tk85/files/patch-unix-Makefile.in
+++ b/x11-toolkits/tk85/files/patch-unix-Makefile.in
@@ -32,8 +32,12 @@
  
  # Subdirectory of $(libdir) containing the pkgIndex.tcl file for loadable Tk
  TK_PKG_DIR		= @TK_PKG_DIR@
-@@ -220,8 +222,8 @@
- INSTALL_STRIP_LIBRARY   = -S -x
+@@ -217,11 +219,11 @@ TKTEST_EXE		= tktest${EXE_SUFFIX}
+ # with the distribution, which is slower but guaranteed to work.
+ 
+ INSTALL_STRIP_PROGRAM   = -s
+-INSTALL_STRIP_LIBRARY   = -S -x
++INSTALL_STRIP_LIBRARY   = -S --strip-unneeded
  
  INSTALL			= $(SHELL) $(UNIX_DIR)/install-sh -c
 -INSTALL_PROGRAM		= ${INSTALL}
diff --git a/x11-toolkits/tk86/files/patch-Makefile.in b/x11-toolkits/tk86/files/patch-Makefile.in
index 3f7926d5dfa2..c531e2577899 100644
--- a/x11-toolkits/tk86/files/patch-Makefile.in
+++ b/x11-toolkits/tk86/files/patch-Makefile.in
@@ -18,6 +18,15 @@
  
  # Directory in which to install the demo files:
  DEMO_INSTALL_DIR	= $(INSTALL_ROOT)$(TK_LIBRARY)/demos
+@@ -220,7 +222,7 @@ TKTEST_EXE		= tktest${EXE_SUFFIX}
+ # with the distribution, which is slower but guaranteed to work.
+ 
+ INSTALL_STRIP_PROGRAM   = -s
+-INSTALL_STRIP_LIBRARY   = -S -x
++INSTALL_STRIP_LIBRARY   = -S --strip-unneeded
+ 
+ INSTALL			= $(SHELL) $(UNIX_DIR)/install-sh -c
+ INSTALL_PROGRAM		= ${INSTALL}
 @@ -561,6 +563,8 @@ TTK_HDRS = $(TTK_DIR)/ttkTheme.h $(TTK_DIR)/ttkDecls.h
  PUBLIC_HDRS = $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkDecls.h \
  	$(GENERIC_DIR)/tkPlatDecls.h $(@TK_WINDOWINGSYSTEM@_HDRS)
diff --git a/x11-toolkits/tk87/files/patch-unix-Makefile.in b/x11-toolkits/tk87/files/patch-unix-Makefile.in
index 5854765bdf6f..7387cf7c5ca5 100644
--- a/x11-toolkits/tk87/files/patch-unix-Makefile.in
+++ b/x11-toolkits/tk87/files/patch-unix-Makefile.in
@@ -9,6 +9,15 @@
  
  # Directory in which to install the demo files:
  DEMO_INSTALL_DIR	= $(INSTALL_ROOT)@DEMO_DIR@
+@@ -220,7 +220,7 @@ TKTEST_EXE		= tktest${EXE_SUFFIX}
+ # with the distribution, which is slower but guaranteed to work.
+ 
+ INSTALL_STRIP_PROGRAM   = -s
+-INSTALL_STRIP_LIBRARY   = -S -x
++INSTALL_STRIP_LIBRARY   = -S --strip-unneeded
+ 
+ INSTALL			= $(SHELL) $(UNIX_DIR)/install-sh -c
+ INSTALL_PROGRAM		= ${INSTALL}
 @@ -772,8 +772,7 @@ INSTALL_DOC_TARGETS = install-doc
  INSTALL_DEV_TARGETS = install-headers
  INSTALL_DEMO_TARGETS = install-demos