From nobody Sun Jul 09 10:44:15 2023 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 4QzNzg5H3Wz4lpJT; Sun, 9 Jul 2023 10:44:15 +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 4QzNzg4Vvbz4TLH; Sun, 9 Jul 2023 10:44:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688899455; 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=O3zl1s+0eDl60fjida9ZlumWzSAtgnkB3H1TgL7wPg8=; b=lTZLKU/EXkjSMICmYB8fo70mJqkDQLfW0L5EoHit9p2B0WPxxuQ9JiBpOFh9xTFCP0oTTB d0V+pjFkLMaJ+gLcdkdhTQI+LAxZfaPPosOIRIq2qXiAAnknOaRsPWfZZJjER9AFg1nYEi Pxghyxgfnnj41W1+S+5RwhWnLMMA1ewfttSciPqjsL0PEJxveQxngWMdo+8mdWtUNywaRR vcmisSyJiB0rGcl4IuQ6ROYHIyrG0/NK/ydwoUqmei4N0gGjg2W95BHXqnDxQatLlOfI/Y sd3yRguA4LDP/ko8OXmFLTEPXqVo6Zgy1xJOZPDqrOIsLgKY3pzIVhUHqW0YMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688899455; 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=O3zl1s+0eDl60fjida9ZlumWzSAtgnkB3H1TgL7wPg8=; b=bohVdBukwG8GqNHWJcvMZNJSFWLI23+41VK0xo7KKskBs+7qeLS/oAsq1YapEatdswl4Cs CRxvPlK/oLidM7Aw8uPB4HTwP5uLNgnf83PHso6rABEXBLLxQu4ydpv4zin+TfdAH2ka93 Oqj67M5CBf63PyjPz89PZKSOK8uAeNhrZJlGQX5txPsDPjfH/kaNrIef4gVmLVPten+dZb pSF+sjxL9kLGcXvCB6ikSlh0tzucC+oinCd5QYrR+A8o/t7LbfAM+J+2FnAv4iTJDO+UHZ r3esQWyjCsnNgjYxyQ1BfEfKvvT2fRTSb+zmBqD+7gEDb/2m6WhSpuitDzd9UQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688899455; a=rsa-sha256; cv=none; b=K5fy6BSbcitC6vkIrjxIpDpGaDYxU5N4oSlPqUnMPtr9/6MlsyOgmd3F3Zmj7wUO6gVZ43 0iB9BOdm+/ozvXREkPh621buNMc7oNQx5YBFgdONmw7mcb6HLCZFePFT4tLlWZqdY0NKlZ 9f9GCGa8eJ0VHR1yw4/8KWAOiDamTyFaQMb0NWeWOt6a49dALkb9wKcdTCxs4kI5PqAzRA 7Vs9FXbOGDxpHakrU8ff+X6kEaHPM2TOrzRYHJYQ9dB9lS9volVzcVkN7YeLjKrXK2V7NG SaexEDQbGEbfs6ys0Pjfrl+YSggofTklIjGEfx6zmNRc9YB72Tmo/kvRsvdR3g== 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 4QzNzg3cW5z10Vk; Sun, 9 Jul 2023 10:44:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 369AiFuS082579; Sun, 9 Jul 2023 10:44:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 369AiFAw082578; Sun, 9 Jul 2023 10:44:15 GMT (envelope-from git) Date: Sun, 9 Jul 2023 10:44:15 GMT Message-Id: <202307091044.369AiFAw082578@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 9f2c8360e8a2 - main - devel/rubygem-unicode: Fix build with Clang 16 and remove the workaround 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: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9f2c8360e8a2b7b39910a3d7359242338205fc15 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=9f2c8360e8a2b7b39910a3d7359242338205fc15 commit 9f2c8360e8a2b7b39910a3d7359242338205fc15 Author: Po-Chuan Hsieh AuthorDate: 2023-07-09 10:25:37 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-07-09 10:25:37 +0000 devel/rubygem-unicode: Fix build with Clang 16 and remove the workaround unicode.c:1039:20: error: incompatible function pointer types passing 'VALUE (get_categories_param *)' (aka 'unsigned long (struct _get_categories_param *)') to parameter of type 'VALUE (*)(VALUE)' (aka 'unsigned long (*)(unsigned long)') [-Wincompatible-function-pointer-types] return rb_ensure(get_categories_internal, (VALUE)¶m, ^~~~~~~~~~~~~~~~~~~~~~~ /usr/local/include/ruby-3.1/ruby/internal/iterator.h:425:25: note: passing argument to parameter 'b_proc' here VALUE rb_ensure(VALUE (*b_proc)(VALUE), VALUE data1, VALUE (*e_proc)(VALUE), VALUE data2); ^ unicode.c:1040:20: error: incompatible function pointer types passing 'VALUE (WString *)' (aka 'unsigned long (struct _WString *)') to parameter of type 'VALUE (*)(VALUE)' (aka 'unsigned long (*)(unsigned long)') [-Wincompatible-function-pointer-types] get_categories_ensure, (VALUE)&wstr); ^~~~~~~~~~~~~~~~~~~~~ /usr/local/include/ruby-3.1/ruby/internal/iterator.h:425:62: note: passing argument to parameter 'e_proc' here VALUE rb_ensure(VALUE (*b_proc)(VALUE), VALUE data1, VALUE (*e_proc)(VALUE), VALUE data2); ^ unicode.c:1057:20: error: incompatible function pointer types passing 'VALUE (get_categories_param *)' (aka 'unsigned long (struct _get_categories_param *)') to parameter of type 'VALUE (*)(VALUE)' (aka 'unsigned long (*)(unsigned long)') [-Wincompatible-function-pointer-types] return rb_ensure(get_categories_internal, (VALUE)¶m, ^~~~~~~~~~~~~~~~~~~~~~~ /usr/local/include/ruby-3.1/ruby/internal/iterator.h:425:25: note: passing argument to parameter 'b_proc' here VALUE rb_ensure(VALUE (*b_proc)(VALUE), VALUE data1, VALUE (*e_proc)(VALUE), VALUE data2); ^ unicode.c:1058:20: error: incompatible function pointer types passing 'VALUE (WString *)' (aka 'unsigned long (struct _WString *)') to parameter of type 'VALUE (*)(VALUE)' (aka 'unsigned long (*)(unsigned long)') [-Wincompatible-function-pointer-types] get_categories_ensure, (VALUE)&wstr); ^~~~~~~~~~~~~~~~~~~~~ /usr/local/include/ruby-3.1/ruby/internal/iterator.h:425:62: note: passing argument to parameter 'e_proc' here VALUE rb_ensure(VALUE (*b_proc)(VALUE), VALUE data1, VALUE (*e_proc)(VALUE), VALUE data2); ^ unicode.c:1227:20: error: incompatible function pointer types passing 'VALUE (get_text_elements_param *)' (aka 'unsigned long (struct _get_text_elements_param *)') to parameter of type 'VALUE (*)(VALUE)' (aka 'unsigned long (*)(unsigned long)') [-Wincompatible-function-pointer-types] return rb_ensure(get_text_elements_internal, (VALUE)¶m, ^~~~~~~~~~~~~~~~~~~~~~~~~~ /usr/local/include/ruby-3.1/ruby/internal/iterator.h:425:25: note: passing argument to parameter 'b_proc' here VALUE rb_ensure(VALUE (*b_proc)(VALUE), VALUE data1, VALUE (*e_proc)(VALUE), VALUE data2); ^ unicode.c:1228:20: error: incompatible function pointer types passing 'VALUE (WString *)' (aka 'unsigned long (struct _WString *)') to parameter of type 'VALUE (*)(VALUE)' (aka 'unsigned long (*)(unsigned long)') [-Wincompatible-function-pointer-types] get_text_elements_ensure, (VALUE)&wstr); ^~~~~~~~~~~~~~~~~~~~~~~~ /usr/local/include/ruby-3.1/ruby/internal/iterator.h:425:62: note: passing argument to parameter 'e_proc' here VALUE rb_ensure(VALUE (*b_proc)(VALUE), VALUE data1, VALUE (*e_proc)(VALUE), VALUE data2); ^ 20 warnings and 6 errors generated. --- devel/rubygem-unicode/Makefile | 6 ------ devel/rubygem-unicode/files/patch-clang16 | 35 +++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 6 deletions(-) diff --git a/devel/rubygem-unicode/Makefile b/devel/rubygem-unicode/Makefile index 2dd1cd924632..80b0f11e736c 100644 --- a/devel/rubygem-unicode/Makefile +++ b/devel/rubygem-unicode/Makefile @@ -11,10 +11,4 @@ LICENSE= RUBY USES= gem -.include - -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091 -CONFIGURE_ARGS+= --with-cflags="-Wno-error=incompatible-function-pointer-types" -.endif - .include diff --git a/devel/rubygem-unicode/files/patch-clang16 b/devel/rubygem-unicode/files/patch-clang16 new file mode 100644 index 000000000000..998fecd504ff --- /dev/null +++ b/devel/rubygem-unicode/files/patch-clang16 @@ -0,0 +1,35 @@ +--- ext/unicode/unicode.c.orig 2023-07-03 15:50:18 UTC ++++ ext/unicode/unicode.c +@@ -1036,8 +1036,8 @@ unicode_get_categories(VALUE obj, VALUE str) + #endif + WStr_allocWithUTF8L(&wstr, RSTRING_PTR(str), RSTRING_LEN(str)); + +- return rb_ensure(get_categories_internal, (VALUE)¶m, +- get_categories_ensure, (VALUE)&wstr); ++ return rb_ensure((VALUE (*)(VALUE)) get_categories_internal, (VALUE)¶m, ++ (VALUE (*)(VALUE)) get_categories_ensure, (VALUE)&wstr); + /* wstr will be freed in get_text_elements_ensure() */ + } + +@@ -1054,8 +1054,8 @@ unicode_get_abbr_categories(VALUE obj, VALUE str) + #endif + WStr_allocWithUTF8L(&wstr, RSTRING_PTR(str), RSTRING_LEN(str)); + +- return rb_ensure(get_categories_internal, (VALUE)¶m, +- get_categories_ensure, (VALUE)&wstr); ++ return rb_ensure((VALUE (*)(VALUE)) get_categories_internal, (VALUE)¶m, ++ (VALUE (*)(VALUE)) get_categories_ensure, (VALUE)&wstr); + /* wstr will be freed in get_text_elements_ensure() */ + } + +@@ -1224,8 +1224,8 @@ unicode_get_text_elements(VALUE obj, VALUE str) + #endif + WStr_allocWithUTF8L(&wstr, RSTRING_PTR(str), RSTRING_LEN(str)); + +- return rb_ensure(get_text_elements_internal, (VALUE)¶m, +- get_text_elements_ensure, (VALUE)&wstr); ++ return rb_ensure((VALUE (*)(VALUE)) get_text_elements_internal, (VALUE)¶m, ++ (VALUE (*)(VALUE)) get_text_elements_ensure, (VALUE)&wstr); + /* wstr will be freed in get_text_elements_ensure() */ + } +