Date: Thu, 6 Jan 2022 13:14:08 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: 552140e98ee4 - main - lang/tcl86: fix build with non-default options (THREADS off) Message-ID: <202201061314.206DE86V084966@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=552140e98ee4fad6376883482f47cbd6c7c6a05d commit 552140e98ee4fad6376883482f47cbd6c7c6a05d Author: Pietro Cerutti <gahr@FreeBSD.org> AuthorDate: 2022-01-06 13:10:55 +0000 Commit: Pietro Cerutti <gahr@FreeBSD.org> CommitDate: 2022-01-06 13:13:58 +0000 lang/tcl86: fix build with non-default options (THREADS off) The additional lines in the patch to unix/configure were erroneously placed inside an if block that was guarded by the enablement of the THREADS option. PR: 260970 Reported by: David Armstrong <bink19th@pm.me> --- lang/tcl86/files/patch-unix-configure | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/lang/tcl86/files/patch-unix-configure b/lang/tcl86/files/patch-unix-configure index d6c3b2f17009..a3e67dd721f4 100644 --- a/lang/tcl86/files/patch-unix-configure +++ b/lang/tcl86/files/patch-unix-configure @@ -1,15 +1,13 @@ ---- unix/configure.orig 2021-11-04 15:04:06.000000000 +0000 -+++ unix/configure 2021-11-05 08:32:29.535316000 +0000 -@@ -7327,8 +7327,12 @@ +--- unix/configure.orig 2021-11-04 15:04:06 UTC ++++ unix/configure +@@ -7323,6 +7323,10 @@ fi - # The -pthread needs to go in the LDFLAGS, not LIBS - LIBS=`echo $LIBS | sed s/-pthread//` -+ SHLIB_LD_LIBS="${SHLIB_LD_LIBS} -Wl,-soname,\$@" - CFLAGS="$CFLAGS $PTHREAD_CFLAGS" - LDFLAGS="$LDFLAGS $PTHREAD_LIBS" -+ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a' -+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1' -+ TCL_LIB_VERSIONS_OK=nodots - fi + case $system in + DragonFly-*|FreeBSD-*) ++ SHLIB_LD_LIBS="${SHLIB_LD_LIBS} -Wl,-soname,\$@" ++ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a' ++ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1' ++ TCL_LIB_VERSIONS_OK=nodots + if test "${TCL_THREADS}" = "1"; then - ;; + # The -pthread needs to go in the LDFLAGS, not LIBS
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202201061314.206DE86V084966>