From nobody Thu May 18 21:37:13 2023 X-Original-To: dev-commits-ports-main@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 4QMjx52GKkz4C2pn; Thu, 18 May 2023 21:37:13 +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 4QMjx51ZH3z40sM; Thu, 18 May 2023 21:37:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684445833; 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=xMvocpdPwnCTNnTTSBTPMQwpMhq/Lbv5sG7o3MVgReo=; b=wJ9bn8rD36mwECVEGUzoV2iRQ6TsWweE46oJGkwKy2RRDeoh8VUch/MsdGhlfiwtn66SMQ p0jZSR/JfeCeqVYUbRwjuWeVRonnFw1D+3rKMkN+xNyFqD267eDEKSNMfrgjQ6I2KTnjyA g9+o5Hz2fqyBF3gJYU0qR5pLPquKc8HYbokQblBrz9ep2G3r6b2NlAs45QUIn7yAhQHgHG g8+b2QCpRp7UWUNHPk62YyhOzEa8iBxCOXprNn+4+h/cw/pUZ2S3/nx7eLcMGQqQsRGwTX JeWUIXs5IE17IHtBg3vob0HHPnUhV9qUkuZOnh6jZfNWmObqGf3803+CL2Dehw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684445833; 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=xMvocpdPwnCTNnTTSBTPMQwpMhq/Lbv5sG7o3MVgReo=; b=wggS1dvVzYazwkDO6BvK8vgtgIXU6YiygOwKnU276RQ4pQ6KaSyCxey/LwDjoqxJyKBMJH LBOE9Dktw3U1MPafiZY2as7vrQRuHGKHMtByJjm4BbNrmXi9xGNO+5HSuLIxe+i+IbGbpd r6YvzS8vicIp3+EmhtcxoZldpdZLI64TxQExfxRvsCvaq91YZuEsCiH2zvWDbH1+4G+j6/ UABfZQs0KDlJhjRLqkdu/iajZkAzbSOmOvGeCGZN6Z76uwW+ZLEP9YrIucrJXz79hX2Y5I bc2pm21TKGDzli1B8+pSi5l//WbwtG1khST1svm6pRMp0QUGbbgHxNGrwMaHew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684445833; a=rsa-sha256; cv=none; b=BsfXGzL1pD2mNDTyCthdRtQJG1NRuCJdXdNiDx0huzqfkMKJQJr/8tp2KcLQ9AjvI4K8qr +DoH0QZVfZZiCsC/NU4+W+HDdFvHVB2/HXr57XxvOrpnLLfTE6BJwDwXehpDixWmrr10pO L2K0Bemx+ZBhM2l3z6tkVcqICGBPdZAyILOQ3Ri1jDQ2U1uj2eBFG/TMrlBUUWYw77UBZ9 jcuh9is3oawIKwHCq4tL/GmkJpy+iYPcV7ky2SKkbHkGsoUfb1sHZzGTTJ6mK2jq8hp+ZV SZNwKC/fq7zjioXwlil1jAyM7dJQPlzH9L8RsIijNSdopdsCv/i3mhQvkzsW/g== 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 4QMjx50ddDz12Wq; Thu, 18 May 2023 21:37:13 +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 34ILbDx8063965; Thu, 18 May 2023 21:37:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34ILbD1T063964; Thu, 18 May 2023 21:37:13 GMT (envelope-from git) Date: Thu, 18 May 2023 21:37:13 GMT Message-Id: <202305182137.34ILbD1T063964@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dimitry Andric Subject: git: c035007f958a - main - devel/boost-libs: apply upstream patch for C++17 support List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c035007f958a9fa3c45bb1441a63540be39018ed Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=c035007f958a9fa3c45bb1441a63540be39018ed commit c035007f958a9fa3c45bb1441a63540be39018ed Author: Dimitry Andric AuthorDate: 2023-05-18 13:10:20 +0000 Commit: Dimitry Andric CommitDate: 2023-05-18 21:33:57 +0000 devel/boost-libs: apply upstream patch for C++17 support Since clang 16 (and gcc 11) the default C++ standard is now gnu++17. Several ports that use boost/functional.hpp now complain with (for example print/libmspub01): In file included from MSPUBCollector.cpp:17: In file included from /usr/local/include/boost/multi_array.hpp:34: In file included from /usr/local/include/boost/multi_array/multi_array_ref.hpp:32: /usr/local/include/boost/functional.hpp:45:24: error: no member named 'unary_function' in namespace 'std'; did you mean '__unary_function'? using std::unary_function; ~~~~~^~~~~~~~~~~~~~ __unary_function /usr/include/c++/v1/__functional/unary_function.h:46:1: note: '__unary_function' declared here using __unary_function = __unary_function_keep_layout_base<_Arg, _Result>; ^ In file included from MSPUBCollector.cpp:17: In file included from /usr/local/include/boost/multi_array.hpp:34: In file included from /usr/local/include/boost/multi_array/multi_array_ref.hpp:32: /usr/local/include/boost/functional.hpp:46:24: error: no member named 'binary_function' in namespace 'std'; did you mean '__binary_function'? using std::binary_function; ~~~~~^~~~~~~~~~~~~~~ __binary_function /usr/include/c++/v1/__functional/binary_function.h:49:1: note: '__binary_function' declared here using __binary_function = __binary_function_keep_layout_base<_Arg1, _Arg2, _Result>; ^ This is because std::unary_function and std::binary_function were removed from C++17. Upstream boost/functional fixed this in https://github.com/boostorg/functional/commit/6a573e4, so apply that patch until boost 1.83.0 is released with it. PR: 271488 Approved by: fluffy (maintainer) MFH: 2023Q2 --- devel/boost-libs/Makefile | 2 +- devel/boost-libs/files/patch-boost_functional.hpp | 28 +++++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/devel/boost-libs/Makefile b/devel/boost-libs/Makefile index 5ce2aa66d57f..04cf1418b04a 100644 --- a/devel/boost-libs/Makefile +++ b/devel/boost-libs/Makefile @@ -1,5 +1,5 @@ PORTNAME= boost-libs -PORTREVISION?= 0 +PORTREVISION?= 1 COMMENT= Free portable C++ libraries (without Boost.Python) WWW= https://www.boost.org/ diff --git a/devel/boost-libs/files/patch-boost_functional.hpp b/devel/boost-libs/files/patch-boost_functional.hpp new file mode 100644 index 000000000000..81bd33069087 --- /dev/null +++ b/devel/boost-libs/files/patch-boost_functional.hpp @@ -0,0 +1,28 @@ +From 6a573e4b8333ee63ee62ce95558c3667348db233 Mon Sep 17 00:00:00 2001 +From: Glen Fernandes +Date: Mon, 17 Apr 2023 06:59:02 -0400 +Subject: [PATCH] Define unary_function and binary_function unconditionally + +--- boost/functional.hpp.orig 2023-04-10 13:47:33 UTC ++++ boost/functional.hpp +@@ -21,7 +21,6 @@ namespace boost + namespace functional + { + namespace detail { +-#if defined(_HAS_AUTO_PTR_ETC) && !_HAS_AUTO_PTR_ETC + // std::unary_function and std::binary_function were both removed + // in C++17. + +@@ -39,12 +38,6 @@ namespace boost + typedef Arg2 second_argument_type; + typedef Result result_type; + }; +-#else +- // Use the standard objects when we have them. +- +- using std::unary_function; +- using std::binary_function; +-#endif + } + } +