From nobody Sun Dec 18 17:43:42 2022 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 4NZqvL2HL1z1GmQj; Sun, 18 Dec 2022 17:43:42 +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 4NZqvL1sHhz4Hm7; Sun, 18 Dec 2022 17:43:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671385422; 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=U52xjmTeI73hTqkHQY+gNA6hjKLDY42Nv383BoSBGjw=; b=qbz8Irw84hwQFGgk6j7LuuwApkDtupt1MrpYxC6UQczv6l4dLjHOdd/Mjby+gIvKJcWt6o yrJEUUw5AL7QxWodDg5uo8xyyMrekinI7Xc9hAn976wTVi7P/EBIsZ9WUdDnV59U2rb09a X2DhZkta1GYUkPKrZjSYbJfAjbiN87gSEEuoW4u79/zQ2An+jKMz8uRG4VP4E2BWGp0/2/ bM5SUWPjUWPQK/p8mWe9FYiNZ6+aUuaDwp/G2gaBCPPAgXtZWYBFNB1Bfl6Lm5z21PZWFX lm2HIO6p1TmwlRWNQK9KWOQGg6ud91D1mme5z8uzL7/9xWf8xcn6dLUl9yPzdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671385422; 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=U52xjmTeI73hTqkHQY+gNA6hjKLDY42Nv383BoSBGjw=; b=ashjLJxeSH9GI9buYeGCW2BRMuOM4pBs3MUH9ajfU9mLFkQLK9aWm9i2j9g/oO7QI7MPew S6OkxAarSXJagawrsr0UAwawlLkUBHpMv47N6/LM1BlcZ4HDqEaBmx7Rdthyu6ybIUAoOr ag755ds7AuDwUrF1MVCtJdxtfFuqe3M8Y2TVJvDK9tNZRTM29G3iF6JUX4aeUYfF5b2ul+ Zq0w207Vn0p/izjD+B5F/5CPfxibv4XM1wMio+qQC7DU3OUO9lgC04NLr0rGy+/dqDXGk6 y7ePXT0vG3ZBDp8Q/00Z7mPw80Wy5CWmvIC6PhPd4PqX3ak5pIjc08+iv+sjRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671385422; a=rsa-sha256; cv=none; b=ruwL7trVcD+h22byRQsMOSFB7zbm3nP1pE84QLTRiA60GlnoyW8zcXQ2bREvTagu1BQTbJ Pmx+R8Qzg18XnYafoG5Rla7S0NHi+dcoZn3XyKxpjHd1rYGqvWCSQhIleyHCkposqLGdjl 5zVkq3aauHtOpVEmL+Nym3NWOoBT6Q7pgElgyYMcBvgJBeqBy+Nm8lS6KW097UcApnGEyX Jvm5YFC7BFSh+T7A+By7sFUYoB5UR7KAe6f5q6A+24OLlO4WySNtG+8UB9ixwQcKR08AOb 723nqSMMM33P76JfJrclqQ1zJ+U4WV/Q9FDgF2S+3cMbcscRwuoCKCOj7UHxUw== 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 4NZqvL0xxWzPwY; Sun, 18 Dec 2022 17:43:42 +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 2BIHhg5L006257; Sun, 18 Dec 2022 17:43:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BIHhgwo006256; Sun, 18 Dec 2022 17:43:42 GMT (envelope-from git) Date: Sun, 18 Dec 2022 17:43:42 GMT Message-Id: <202212181743.2BIHhgwo006256@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: d7146f6d335b - main - java/openjdk8: fix build with clang 15 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: d7146f6d335b360c5c9fb736cf49c7af939b77d7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim (src committer): URL: https://cgit.FreeBSD.org/ports/commit/?id=d7146f6d335b360c5c9fb736cf49c7af939b77d7 commit d7146f6d335b360c5c9fb736cf49c7af939b77d7 Author: Dimitry Andric AuthorDate: 2022-12-07 14:53:48 +0000 Commit: Dimitry Andric CommitDate: 2022-12-18 17:23:58 +0000 java/openjdk8: fix build with clang 15 During an exp-run for llvm 15 (see bug 265425), it turned out that java/openjdk8 failed to build with clang 15: /wrkdirs/usr/ports/java/openjdk8/work/jdk8u-jdk8u352-b08.1/jdk/src/share/bin/splashscreen_stubs.c:64:30: error: incompatible pointer to integer conversion returning 'void *' from a function with result type 'int' [-Wint-conversion] INVOKE(SplashLoadMemory, NULL)(pdata, size); ^~~~ /usr/include/sys/_null.h:34:14: note: expanded from macro 'NULL' #define NULL ((void *)0) ^~~~~~~~~~~ /wrkdirs/usr/ports/java/openjdk8/work/jdk8u-jdk8u352-b08.1/jdk/src/share/bin/splashscreen_stubs.c:60:39: note: expanded from macro 'INVOKE' #define INVOKE(name,def) _INVOKE(name,def,return) ^~~ /wrkdirs/usr/ports/java/openjdk8/work/jdk8u-jdk8u352-b08.1/jdk/src/share/bin/splashscreen_stubs.c:57:25: note: expanded from macro '_INVOKE' if (!proc) { return def; } \ ^~~ /wrkdirs/usr/ports/java/openjdk8/work/jdk8u-jdk8u352-b08.1/jdk/src/share/bin/splashscreen_stubs.c:68:28: error: incompatible pointer to integer conversion returning 'void *' from a function with result type 'int' [-Wint-conversion] INVOKE(SplashLoadFile, NULL)(filename); ^~~~ /usr/include/sys/_null.h:34:14: note: expanded from macro 'NULL' #define NULL ((void *)0) ^~~~~~~~~~~ /wrkdirs/usr/ports/java/openjdk8/work/jdk8u-jdk8u352-b08.1/jdk/src/share/bin/splashscreen_stubs.c:60:39: note: expanded from macro 'INVOKE' #define INVOKE(name,def) _INVOKE(name,def,return) ^~~ /wrkdirs/usr/ports/java/openjdk8/work/jdk8u-jdk8u352-b08.1/jdk/src/share/bin/splashscreen_stubs.c:57:25: note: expanded from macro '_INVOKE' if (!proc) { return def; } \ ^~~ 2 errors generated. Indeed, instead of the pointer value NULL, the integer value 0 should be used. PR: 268223 Approved by: portmgr (tcberner) MFH: 2022Q4 --- .../files/patch-jdk_src_share_bin_splashscreen__stubs.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/java/openjdk8/files/patch-jdk_src_share_bin_splashscreen__stubs.c b/java/openjdk8/files/patch-jdk_src_share_bin_splashscreen__stubs.c new file mode 100644 index 000000000000..80019e780130 --- /dev/null +++ b/java/openjdk8/files/patch-jdk_src_share_bin_splashscreen__stubs.c @@ -0,0 +1,16 @@ +--- jdk/src/share/bin/splashscreen_stubs.c.orig 2022-07-31 16:21:00 UTC ++++ jdk/src/share/bin/splashscreen_stubs.c +@@ -61,11 +61,11 @@ int DoSplashLoadMemory(void* pdata, int size) { + #define INVOKEV(name) _INVOKE(name, ,;) + + int DoSplashLoadMemory(void* pdata, int size) { +- INVOKE(SplashLoadMemory, NULL)(pdata, size); ++ INVOKE(SplashLoadMemory, 0)(pdata, size); + } + + int DoSplashLoadFile(const char* filename) { +- INVOKE(SplashLoadFile, NULL)(filename); ++ INVOKE(SplashLoadFile, 0)(filename); + } + + void DoSplashInit(void) {