From nobody Wed Apr 27 17:04:52 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 4F3A519994A3; Wed, 27 Apr 2022 17:04:53 +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 4KpQ910P7Zz4Yhy; Wed, 27 Apr 2022 17:04:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651079093; 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=syYcT15YVa3tF+rqI5X2scTfcx7ilwJNXuhJjGsdtU8=; b=X5pIbaiykSlBoyrkKIERXiBWRXDxAqerGqL4Lzcj1NhjZeNLQQ2Cfp4xPPvStJ8PjGSCbJ zU4ngrGwHZ2Z4eV7oiubAYQpdJbM2SH6+gn/6Reu/ziD1gSUAe/lfC55otynGBmo6+KsH1 4vsO4v0aBBXbb3HWT7d7bmbon+FkT+KtgDg2MjZIKH6k6gw3cva2ijzA5/XRLgRvDgJeHP wvMvkQVDvoBdpdJaitPf8qGKjZIaTIHt7xKpk8UzkUpCMa2VHpupVlagx/KAtVwA+8uaoq yuTc7rZlfvr1lQ1QBntZPl7ktBiHHFYY48b4W/DZ1KMH6RYYxGhUTpXAfJ7x7g== 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 CD45D27AFD; Wed, 27 Apr 2022 17:04:52 +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 23RH4qUT057757; Wed, 27 Apr 2022 17:04:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23RH4qZd057756; Wed, 27 Apr 2022 17:04:52 GMT (envelope-from git) Date: Wed, 27 Apr 2022 17:04:52 GMT Message-Id: <202204271704.23RH4qZd057756@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Tijl Coosemans Subject: git: f041aca7adf2 - 2022Q2 - devel/libunwind: use base system unwind.h 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: tijl X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q2 X-Git-Reftype: branch X-Git-Commit: f041aca7adf2d5ee3742d2c3e98fdc4e7c045fe5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651079093; 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=syYcT15YVa3tF+rqI5X2scTfcx7ilwJNXuhJjGsdtU8=; b=QqOhjl9Uf2GxrpAADGDvcbYamVj1JjPjvlimiHOUE2SRBEE1ssgiFiZczihrx4yci/r+sr WA+m/PVGFKUgV/gj3ePhFB7TzGTuwh7Mlx+5d9LhbKdaAQsk5FhUIirDv/G1hiel+MxItc gSp8sqvPELEDDZDVAWj+R0yw8R3vnuKC71vAOZ/OeDXTZoRvT/Th/rmPqHf95puO5Gzkjs FEjYokHcCyKCnEJdPlfeBNxA1/uwGMciv9v+hubtcCk2LWd2ikC5gkGsplKcqf4ZyvBj/u eOi6ggor6vUHqgba76xpuqQ6N/82VMdYMGd2TlIRUYafOPhpSWxlcYU+KItCqg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651079093; a=rsa-sha256; cv=none; b=wlLnuYeVLUT1hM7QBT+L/ka1SB1SzCZTPDP0xMrJpzn9OTk+rFSQtosSoEaxb9RGrEewZc +Db9X5Gs3Dyjhpt37GFJa+yMPj9/Z8F5RpqxWle7eL0vuDeYi+J09uScn3P0vZRL3tg8So pqwIWpgnt/4D8rFx2ocazyvoaTfHVAPcPukdk827/ZLQ9otEJ09gQ9rwXxSCg+mwLc1CC3 clF/LBp7IrAKQkzRcGvYMsCrRA/taA9b8WeM0jkaRcwBrePyGp3kRaJ1u2mQj6CtHWoyUf QeJrXIa5ifoemRUNuVodmYiatCs213eMzmT2YSOjLrLNrKYYOOCfBVpv8wytRQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q2 has been updated by tijl: URL: https://cgit.FreeBSD.org/ports/commit/?id=f041aca7adf2d5ee3742d2c3e98fdc4e7c045fe5 commit f041aca7adf2d5ee3742d2c3e98fdc4e7c045fe5 Author: Tijl Coosemans AuthorDate: 2022-04-27 16:51:01 +0000 Commit: Tijl Coosemans CommitDate: 2022-04-27 16:59:02 +0000 devel/libunwind: use base system unwind.h - Add --disable-cxx-exceptions so libunwind does not implement the _Unwind_* API and does not use its internal unwind.h. The base system libgcc_s provides this API. This was already the upstream default for most architectures. - Add --disable-unwind-header to prevent installation of unwind.h. Instead, install an unwind.h that forwards to the base system unwind.h, but not on FreeBSD 14 where all implementations of unwind.h (base, lang/gcc*, and devel/llvm*) are compatible. PR: 263370 Approved by: sunpoet (cherry picked from commit 975a5c1057579603c4041c2b8e3ac0933ea0eb89) --- devel/libunwind/Makefile | 11 ++++++++++- devel/libunwind/files/unwind.h | 26 ++++++++++++++++++++++++++ devel/libunwind/pkg-plist | 1 - 3 files changed, 36 insertions(+), 2 deletions(-) diff --git a/devel/libunwind/Makefile b/devel/libunwind/Makefile index a404f9df3595..5ab156895129 100644 --- a/devel/libunwind/Makefile +++ b/devel/libunwind/Makefile @@ -2,6 +2,7 @@ PORTNAME= libunwind PORTVERSION= 20211201 # This is the release date on https://download.savannah.gnu.org/releases/libunwind/ +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= SAVANNAH \ https://github.com/libunwind/libunwind/releases/download/v${PORTVERSION}/ @@ -17,7 +18,9 @@ ONLY_FOR_ARCHS= aarch64 amd64 armv6 armv7 i386 powerpc64 powerpc64le USES= compiler:c11 cpe libtool pathfix pkgconfig -CONFIGURE_ARGS= ac_cv_path_LATEX2MAN=${TRUE} +CONFIGURE_ARGS= --disable-cxx-exceptions \ + --disable-unwind-header \ + ac_cv_path_LATEX2MAN=${TRUE} GNU_CONFIGURE= yes INSTALL_TARGET= install-strip USE_LDCONFIG= yes @@ -34,4 +37,10 @@ PLIST_SUB+= COREDUMP="" PLIST_SUB+= COREDUMP="@comment " .endif +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1400052 +PLIST_FILES+= include/unwind.h +post-install: + ${INSTALL_DATA} ${FILESDIR}/unwind.h ${STAGEDIR}${PREFIX}/include +.endif + .include diff --git a/devel/libunwind/files/unwind.h b/devel/libunwind/files/unwind.h new file mode 100644 index 000000000000..2d79ed4428de --- /dev/null +++ b/devel/libunwind/files/unwind.h @@ -0,0 +1,26 @@ +#ifndef _LIBUNWIND_UNWIND_H +#define _LIBUNWIND_UNWIND_H + +#if __has_include("/usr/include/unwind.h") +#include "/usr/include/unwind.h" +#elif __has_include("/usr/include/c++/v1/unwind.h") + +#ifdef __cplusplus +extern "C" { +#endif + +#if defined(__arm__) && !defined(__ARM_DWARF_EH__) +#include "/usr/include/c++/v1/unwind-arm.h" +#else +#include "/usr/include/c++/v1/unwind-itanium.h" +#endif + +#ifdef __cplusplus +} +#endif + +#else +#include_next +#endif + +#endif diff --git a/devel/libunwind/pkg-plist b/devel/libunwind/pkg-plist index a776ec5d56b2..73e648228c4a 100644 --- a/devel/libunwind/pkg-plist +++ b/devel/libunwind/pkg-plist @@ -4,7 +4,6 @@ include/libunwind-dynamic.h include/libunwind-ptrace.h include/libunwind-%%ARCH%%.h include/libunwind.h -include/unwind.h %%COREDUMP%%lib/libunwind-coredump.a %%COREDUMP%%lib/libunwind-coredump.so %%COREDUMP%%lib/libunwind-coredump.so.0