From nobody Fri Jun 30 07:22:11 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 4Qsmwg4b0Rz4krVC; Fri, 30 Jun 2023 07:22:11 +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 4Qsmwg2KfPz41Xt; Fri, 30 Jun 2023 07:22:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688109731; 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=URoJHVV14KBA3nMGrEg41xhmVGcUIfMLnX5H+gC4dvg=; b=oO6MkHkA5W5ePiCgC0meE8oXlcPCrcpxwnCT/NMSIb+sI6wzv5uH69IU8hrU7WcqBibj0Z clNy/bjZW1VHE7rbXoDkPv188lvb2KDeFO6THlhdFPefD46ljEVPzDC0IKC3FITVxpraNp ER9XbZcYJzbgKms5VhfDVVU3SwEeEYNl65mBrLxrAeX7M6Bedua+zNX489JaDmVEWda70U B9KFhyPpfOsiA3u/ZQ9asOeUe9ij+hxg4zBvq88IwdxXmj3SzAGR5Bsm93+Hsz7ynvWdpZ QhCnbt0arSc6Irn3+j5+dlImr4PZ1jjfn27g28o7EtDjsalafZyh00eeevoNBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688109731; 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=URoJHVV14KBA3nMGrEg41xhmVGcUIfMLnX5H+gC4dvg=; b=u/v3Zsgna+0HoSd9dHgfGEoL+ehQVWCJJKlAe/mwCgpVONbpCvM+mzSK+AOTGxBL4iNkRn /qbAzuGpLONY7UqVCksDLD4TCGimYkc6+Ri+VT2GlcWAfLqUXGvKyp1EC8lFZqZJjpuu1N ecKR+3VYEy2YTNWdvMpMckMcn1ehtQjLlOtBM2thHYw8naQG4cxj0R6EFatykchDDbdmCc z8BfttZZxN6f6+sV5jTdSa/IPh1NjWO+YIqrkSyHXrYx1su+M+zQEP7x0j7s9sdNG/0apo rcauoP6eUVgVsvpN7Oo4WTjMhXKYa3lk0uz/nVBDGotwWQz91gNGg6UO1PdtXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688109731; a=rsa-sha256; cv=none; b=lLNbXPvnUWtdi8thhevOt6CDcrmAR12IWp53SvjLVKvX5ZcPQ8JVtZhCrN7gJwRknoCf2l XF5j9BtY4G13wC14yFUMU1Y4ODFjNRIsW0uW1xRqiHABoytGuK9kdSIZfv/NFwZx2rWPCI e0jwh46RC80GlMZmyTfDBAa0MbacC3Ia3oLm8BHTuLYY1Y9TdEPe9V7Cc142SDvLSDQm2h EH5lwb7noXJqjfA5ORrEuZrYRwvMVLsRju2PD5gin0bGY/zwdeZJdG7g3lUzAGhXBJ97/3 euVk7qMyP36CCAoek7Vr22cH3lAk6ggWh1pWwUOQaFL3b5gMccAz6Eagc9llCg== 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 4Qsmwg11FJzqPC; Fri, 30 Jun 2023 07:22:11 +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 35U7MBpT081847; Fri, 30 Jun 2023 07:22:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 35U7MB1m081846; Fri, 30 Jun 2023 07:22:11 GMT (envelope-from git) Date: Fri, 30 Jun 2023 07:22:11 GMT Message-Id: <202306300722.35U7MB1m081846@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: ec4c6e9a74cf - main - devel/rubygem-concurrent-ruby-ext: Fix build with Clang 15 and remove the workaround 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: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ec4c6e9a74cf31f3279bd64609078e5aa833334e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=ec4c6e9a74cf31f3279bd64609078e5aa833334e commit ec4c6e9a74cf31f3279bd64609078e5aa833334e Author: Po-Chuan Hsieh AuthorDate: 2023-06-30 07:07:05 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-06-30 07:07:05 +0000 devel/rubygem-concurrent-ruby-ext: Fix build with Clang 15 and remove the workaround atomic_reference.c:108:53: error: incompatible integer to pointer conversion passing 'VALUE' (aka 'unsigned long') to parameter of type 'void *' [-Wint-conversion] if (__sync_bool_compare_and_swap(&DATA_PTR(self), expect_value, new_value)) { ^~~~~~~~~~~~ atomic_reference.c:108:67: error: incompatible integer to pointer conversion passing 'VALUE' (aka 'unsigned long') to parameter of type 'void *' [-Wint-conversion] if (__sync_bool_compare_and_swap(&DATA_PTR(self), expect_value, new_value)) { ^~~~~~~~~ 2 errors generated. --- devel/rubygem-concurrent-ruby-ext/Makefile | 6 ------ devel/rubygem-concurrent-ruby-ext/files/patch-clang15 | 11 +++++++++++ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/devel/rubygem-concurrent-ruby-ext/Makefile b/devel/rubygem-concurrent-ruby-ext/Makefile index 90cda04607c3..e2f16ba8293f 100644 --- a/devel/rubygem-concurrent-ruby-ext/Makefile +++ b/devel/rubygem-concurrent-ruby-ext/Makefile @@ -14,10 +14,4 @@ RUN_DEPENDS= rubygem-concurrent-ruby>=${PORTVERSION}<${PORTVERSION}_99:devel/rub USES= gem -.include - -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) -CONFIGURE_ARGS+= --with-cflags="-Wno-error=int-conversion" -.endif - .include diff --git a/devel/rubygem-concurrent-ruby-ext/files/patch-clang15 b/devel/rubygem-concurrent-ruby-ext/files/patch-clang15 new file mode 100644 index 000000000000..6dc21f68ba35 --- /dev/null +++ b/devel/rubygem-concurrent-ruby-ext/files/patch-clang15 @@ -0,0 +1,11 @@ +--- ext/concurrent-ruby-ext/atomic_reference.c.orig 2023-06-13 15:43:55 UTC ++++ ext/concurrent-ruby-ext/atomic_reference.c +@@ -105,7 +105,7 @@ VALUE ir_compare_and_set(volatile VALUE self, VALUE ex + return Qtrue; + } + #else +- if (__sync_bool_compare_and_swap(&DATA_PTR(self), expect_value, new_value)) { ++ if (__sync_bool_compare_and_swap(&DATA_PTR(self), (void *) expect_value, (void *) new_value)) { + return Qtrue; + } + #endif