From nobody Thu Jan 6 13:14:08 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 72515192CA4C; Thu, 6 Jan 2022 13:14:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JV6J11VhRz4fNy; Thu, 6 Jan 2022 13:14:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 130A42090E; Thu, 6 Jan 2022 13:14:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 206DE8nu084967; Thu, 6 Jan 2022 13:14:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 206DE86V084966; Thu, 6 Jan 2022 13:14:08 GMT (envelope-from git) Date: Thu, 6 Jan 2022 13:14:08 GMT Message-Id: <202201061314.206DE86V084966@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Pietro Cerutti Subject: git: 552140e98ee4 - main - lang/tcl86: fix build with non-default options (THREADS off) List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gahr X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 552140e98ee4fad6376883482f47cbd6c7c6a05d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641474849; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0CtIf/Wpn5NdNt+uYMSKBTPUZTxxIwNXGwEgTW6va0g=; b=r+QQm0UL849jMLcirEDcNOEJauV1qvpdiey0+E9ZoExMmQDweOiq+N/705qFHdIPFDANaw uLCFfcPlnjK2ca9syufhr81SmghLtr4djO2hq4WAfAGg+d2Zs1SuFAQ7gr5NOhdaJGxW+y 7fHiQmRnWdjdUjjDHIN4sGdRV2l9p/7hBZUPYBQNG4vnpZNXQuwHFtGs3uo6nO2BlPE2yM 6FKNu3uBSjuwT3krjP1wCNvoOl7a1UQLH7eb+f7RiFsCOe0CSweuhi3xb5HJVwD9XnhGr0 NmGjdg/ZfRRpD23GoAYUQRtjhK0fVD8UCndBuFc79z79Oc6AMTnqX+q0Wsmgpg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641474849; a=rsa-sha256; cv=none; b=AMQL6D3KSteWDoitHYY7FGdLmxoPST0Ys0M5DZMd31QAXLl6OnDJEuMHMTPHvj/OiXfMkh U3zoTUYM3+O44RI2uZJyqeMVKQ8NzmpV5YAa+RyaalrI4CQDGDyiUqP8jqV/ZDZhYTjWcT hmpgkgwPBkDuwl7LpCMlyqKFVdCQCoN+GEXqJb6AIy5pzzYkbEj7aw1Shnqpy4UIjxu7WU CTPHpoIfTS50I9NhPy72YXoNs6+fkMZBWu3N1FewNV9nKSje/LrLMg4vyd8MPfH13imaQ6 //XuXx36cnHjH/BX51vcftzbchldXhIHvMuDzIJY4+Xi7kmohzIc8/42H+aXAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by gahr: URL: https://cgit.FreeBSD.org/ports/commit/?id=552140e98ee4fad6376883482f47cbd6c7c6a05d commit 552140e98ee4fad6376883482f47cbd6c7c6a05d Author: Pietro Cerutti AuthorDate: 2022-01-06 13:10:55 +0000 Commit: Pietro Cerutti 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 --- 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