Skip to content

Commit

Permalink
lang/tcl86, x11-toolkits/tk86: fix build with WITH_LLVM_BINUTILS (again)
Browse files Browse the repository at this point in the history
The patch committed in 4ef4b5 as part of PR 270768 was lost during the
latest update.

PR:		277712
Reported by:	O. Hartmann (ohartmann@walstatt.org)
  • Loading branch information
gahr committed Mar 19, 2024
1 parent 22d0c88 commit 46238ef
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 2 deletions.
2 changes: 1 addition & 1 deletion lang/tcl86/Makefile
@@ -1,6 +1,6 @@
PORTNAME= tcl
DISTVERSION= ${TCL_VERSION}${TCL_RC}
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= lang
MASTER_SITES= SF/tcl/Tcl/${TCL_VERSION}
PKGNAMESUFFIX= ${SHORT_TCL_VER}
Expand Down
9 changes: 9 additions & 0 deletions lang/tcl86/files/patch-unix-Makefile.in
Expand Up @@ -22,6 +22,15 @@

# Package search path.
TCL_PACKAGE_PATH = @TCL_PACKAGE_PATH@
@@ -151,7 +153,7 @@ INSTALL_STRIP_PROGRAM = strip
# distribution, which is slower but guaranteed to work.

INSTALL_STRIP_PROGRAM = strip
-INSTALL_STRIP_LIBRARY = strip -x
+INSTALL_STRIP_LIBRARY = strip --strip-unneeded

INSTALL = $(SHELL) $(UNIX_DIR)/install-sh -c
INSTALL_PROGRAM = ${INSTALL}
@@ -714,9 +716,9 @@ SRCS = $(GENERIC_SRCS) $(UNIX_SRCS) $(NOTIFY_SRCS) \
# Start of rules
#--------------------------------------------------------------------------
Expand Down
11 changes: 10 additions & 1 deletion x11-toolkits/tk86/files/patch-Makefile.in
Expand Up @@ -18,7 +18,16 @@

# Directory in which to install the demo files:
DEMO_INSTALL_DIR = $(INSTALL_ROOT)$(TK_LIBRARY)/demos
@@ -561,6 +563,8 @@ TTK_HDRS = $(TTK_DIR)/ttkTheme.h $(TTK_DIR)/ttkDecls.h
@@ -220,7 +222,7 @@ INSTALL_STRIP_PROGRAM = strip
# with the distribution, which is slower but guaranteed to work.

INSTALL_STRIP_PROGRAM = strip
-INSTALL_STRIP_LIBRARY = strip -x
+INSTALL_STRIP_LIBRARY = strip --strip-unneeded

INSTALL = $(SHELL) $(UNIX_DIR)/install-sh -c
INSTALL_PROGRAM = ${INSTALL}
@@ -561,6 +563,8 @@ PUBLIC_HDRS = $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkDec
PUBLIC_HDRS = $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkDecls.h \
$(GENERIC_DIR)/tkPlatDecls.h $(@TK_WINDOWINGSYSTEM@_HDRS)

Expand Down

0 comments on commit 46238ef

Please sign in to comment.