From nobody Thu Apr 14 17:06:10 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 8D6FD1B39680; Thu, 14 Apr 2022 17:06:10 +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 4KfQpV3bWxz3n83; Thu, 14 Apr 2022 17:06:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649955970; 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=df3VTzFIp5qtnEuoYCzsTv2il2Prvw9GIoXD5XdeIvM=; b=jbZDti9CmholPnYaGhjZH1EnUsKdp40X/31v4xzYaIRV4kjdcYfdic4Qnb3S9MfhSpQcZF eE5GdFXcv3fta2ifUVTW4m647hy4vBbZdyxZl+QZ11NGpyVK81kCMr9E695fNvTCaVaOox Fpd+gyFJ1gwQVhrQQuhZx7Pndghxt/GyH++Ycm/Lo02ZSpj9LGNEfLV/x0I4ZU1RH+trQS zm/4GDXcaA6HzaHR7CZnOcizxrdkxym2oFTDg5MiZ2AUIOkODB6WpMMg644Y+uCCcmX+PT O2yhnwaPLL0l5LctUCYNIGgGbhlOlhCD0hspCRCNxe6baheaQlKa7GQn0zO7mw== 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 50B7424817; Thu, 14 Apr 2022 17:06:10 +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 23EH6ASb037648; Thu, 14 Apr 2022 17:06:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23EH6APv037647; Thu, 14 Apr 2022 17:06:10 GMT (envelope-from git) Date: Thu, 14 Apr 2022 17:06:10 GMT Message-Id: <202204141706.23EH6APv037647@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: John Baldwin Subject: git: 92d6b833f0a0 - main - devel/gdb: Handle recent 14.0 systems with libc++ in /lib. 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: jhb X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 92d6b833f0a0bd5ef69af2b87dbc97174aaa395c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649955970; 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=df3VTzFIp5qtnEuoYCzsTv2il2Prvw9GIoXD5XdeIvM=; b=VnxXQsVV1F/UTO3hyErRMXAUJkDQd/QYU1+TMnC52tqAIB3EJDGdZnrBVwVUmGFAbKzl8G f8m4EGwtlARcUse4VSsY7qWFqlwuZxB15kshvuFtuDAux7KqMm52LoqjS9O8YAcPFCsBi1 nMmG8woboFWjxMsV/ABHfsfCAbHoEBqwxTh2YEH86Oyjdh55MdVCuE6bwPGsu1dqkRWX1c y22lTihml7S+LVcx2737YN28YVh4H3X6/99Z3ddSLyyR7TzFTgEL5UQl3z7mwLLz9HRV1G l+H3e2QGt1mWRs5WWUOmo3NXbLqrFv4tkDd0xtdIH5PCiUqsPjc+tkS015Ijdw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649955970; a=rsa-sha256; cv=none; b=YvUdxkLNtZ9w7XpajGbpJtKFJQ5ceMYGlHR52xrrQnk8Ck/gCywZrCxR+LTPbXTv3Ry531 mSiUAipJkkDvbFPWmCM/ELHSHCUiMQ7i4BIrCyl0LvGXB07U6ZmnHTmEipAMyZzLPg6Chj AGZFORJidv/qeCGSkOOmOO5u1qebbizTQ//hxchg34Zj8G3tQmYqLVDHfSFXHLdJkExEC+ RiDPbE4JfNoEV3WDcnEMpDgrMIP8o/KIB8QCt7+gpjymUBsGVLWmM3ruq8A51qcPRkgnga pKIdrUQFthiKOSLESTbIUx/69JqIXwQiNCF8LNrzQPpORTcP3tjeidGxSc0Jpw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb (doc, src committer): URL: https://cgit.FreeBSD.org/ports/commit/?id=92d6b833f0a0bd5ef69af2b87dbc97174aaa395c commit 92d6b833f0a0bd5ef69af2b87dbc97174aaa395c Author: John Baldwin AuthorDate: 2022-04-14 17:00:58 +0000 Commit: John Baldwin CommitDate: 2022-04-14 17:00:58 +0000 devel/gdb: Handle recent 14.0 systems with libc++ in /lib. The auto-load python wrapper for libc++ pretty printers has to be installed at the same path as libc++ to work correctly. Update the port to install the top-level wrapper in lib/ under the auto-load data directory instead of usr/lib on recent 14.0 systems. Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D34636 --- devel/gdb/Makefile | 17 +++++++++++++---- devel/gdb/pkg-plist | 4 ++-- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/devel/gdb/Makefile b/devel/gdb/Makefile index 571e3b460996..66ae1ce8316a 100644 --- a/devel/gdb/Makefile +++ b/devel/gdb/Makefile @@ -92,7 +92,8 @@ PKGNAMESUFFIX= ${PYTHON_PKGNAMESUFFIX} .endif .endif -.if ${PORT_OPTIONS:MPYTHON} && exists(/usr/lib/libc++.so.1) +.if ${PORT_OPTIONS:MPYTHON} && \ + (exists(/usr/lib/libc++.so.1) || exists(/lib/libc++.so.1)) USE_GITHUB= nodefault GH_ACCOUNT= bsdjhb:libcxx @@ -102,6 +103,13 @@ GH_TAGNAME= 03d0d9b:libcxx # Workaround USE_GITHUB preventing the default DISTFILES DISTFILES= ${DISTNAME}${EXTRACT_SUFX} +.if exists(/usr/lib/libc++.so.1) +LIBCXX_DIR= /usr/lib +.else +LIBCXX_DIR= /lib +.endif + +PLIST_SUB+= LIBCXX_DIR="${LIBCXX_DIR}" PLIST_SUB+= LIBCXX="" .else PLIST_SUB+= LIBCXX="@comment " @@ -162,10 +170,11 @@ do-install-PYTHON-on: . for f in gdb gdb/command gdb/function gdb/printer @(cd ${STAGEDIR}${PREFIX}/share/gdb/python/${f} ; ${CHMOD} 644 *.py* ) . endfor -.if exists(/usr/lib/libc++.so.1) +.if exists(/usr/lib/libc++.so.1) || exists(/lib/libc++.so.1) @(cd ${WRKSRC_libcxx} ; \ - ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} install ) - @(cd ${STAGEDIR}${PREFIX}/share/gdb/auto-load/usr/lib && \ + ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} \ + LIBCXX_DIR="${LIBCXX_DIR}" install ) + @(cd ${STAGEDIR}${PREFIX}/share/gdb/auto-load/${LIBCXX_DIR} && \ ${PYTHON_CMD} -m compileall .) @(cd ${STAGEDIR}${PREFIX}/share/libcxx-gdbpy/libcxx && \ ${PYTHON_CMD} -m compileall .) diff --git a/devel/gdb/pkg-plist b/devel/gdb/pkg-plist index 653d280c5b1a..4efe03c46e1a 100644 --- a/devel/gdb/pkg-plist +++ b/devel/gdb/pkg-plist @@ -7,8 +7,8 @@ bin/gdb%%VER%% man/man1/gdb%%VER%%.1.gz %%GDB_LINK%%%%KGDB%%man/man1/kgdb.1.gz %%KGDB%%man/man1/kgdb%%VER%%.1.gz -%%LIBCXX%%%%DATADIR%%/auto-load/usr/lib/libc++.so.1-gdb.py -%%LIBCXX%%%%DATADIR%%/auto-load/usr/lib/libc++.so.1-gdb.pyc +%%LIBCXX%%%%DATADIR%%/auto-load%%LIBCXX_DIR%%/libc++.so.1-gdb.py +%%LIBCXX%%%%DATADIR%%/auto-load%%LIBCXX_DIR%%/libc++.so.1-gdb.pyc %%PYTHON%%%%DATADIR%%/python/gdb/__init__.py %%PYTHON%%%%DATADIR%%/python/gdb/__init__.pyc %%PYTHON%%%%DATADIR%%/python/gdb/FrameDecorator.py