Date: Tue, 19 Mar 2024 20:05:10 GMT From: Pietro Cerutti <gahr@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 46238ef81392 - main - lang/tcl86, x11-toolkits/tk86: fix build with WITH_LLVM_BINUTILS (again) Message-ID: <202403192005.42JK5AdW057051@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by gahr: URL: https://cgit.FreeBSD.org/ports/commit/?id=46238ef8139282444bd9723af21c18a036624bae commit 46238ef8139282444bd9723af21c18a036624bae Author: Pietro Cerutti <gahr@FreeBSD.org> AuthorDate: 2024-03-19 19:54:30 +0000 Commit: Pietro Cerutti <gahr@FreeBSD.org> CommitDate: 2024-03-19 20:04:53 +0000 lang/tcl86, x11-toolkits/tk86: fix build with WITH_LLVM_BINUTILS (again) 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) --- lang/tcl86/Makefile | 2 +- lang/tcl86/files/patch-unix-Makefile.in | 9 +++++++++ x11-toolkits/tk86/files/patch-Makefile.in | 11 ++++++++++- 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/lang/tcl86/Makefile b/lang/tcl86/Makefile index edd00c861ab0..b2097dd37362 100644 --- a/lang/tcl86/Makefile +++ b/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} diff --git a/lang/tcl86/files/patch-unix-Makefile.in b/lang/tcl86/files/patch-unix-Makefile.in index b846f5ec0a22..a4c5236e9b9a 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 @@ 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 #-------------------------------------------------------------------------- diff --git a/x11-toolkits/tk86/files/patch-Makefile.in b/x11-toolkits/tk86/files/patch-Makefile.in index 3f7926d5dfa2..b1a41c647fb0 100644 --- a/x11-toolkits/tk86/files/patch-Makefile.in +++ b/x11-toolkits/tk86/files/patch-Makefile.in @@ -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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202403192005.42JK5AdW057051>