From nobody Tue Feb 14 08:44:03 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 4PGF9w0dFmz3rQHR; Tue, 14 Feb 2023 08:44:04 +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 4PGF9v74Lgz3KG6; Tue, 14 Feb 2023 08:44:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676364244; 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=SdO3LSwB9LocXPhPd9Hww3n+LwwhGbmnVoqOgAi5tGg=; b=ZHtts9tHtgzkmva2zvTqBmQ3QpkfVV/9KcAbBw9TX6kkllHkjWn/WFNgv6M38yjXTbKHuw 3tumXdZ8Bt1WKdKbS+m3mQl9oastp5BxkChc23IKhYdFHhENakzNqUF8NfY4jKwRRzK/Pw XgP3G9gzQaq44d0RJlSJ3LcmM6ufkHHLgRQ0tySLVYgyWhXDdcELeE+lseanpanBwhSc/V OW2nL8yYRsxG5TV3zJeKoE/e3LMcWBGr9IkCyVSkKbgWlU5MA7i3pNXFOEdvA9bbsX0Pjt 5Mk8mEepBtf3SBFaH5o2bl1wHqCSJEzi2hTRflJTwlI5PJ8KdJy+IQX/4Crfqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676364244; 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=SdO3LSwB9LocXPhPd9Hww3n+LwwhGbmnVoqOgAi5tGg=; b=ZjwlNARJabm4AVVA8hQQCwMpbbprBbH/F84UqJK5gxgJBGxh/hhqvEY636VlrImnBH69Xk E1bMn7N9OYlU+zxMQJMLLIeEYtYdJn+RVNJmlVvOhOcK4xnBpZ7RTafAgcb02wtxhH6gaR jOO+/lE6fSp9Maju+RA4lf/lRU53Bvq3MFVZVqiqIv9oHkfHft7f+VqPMP1J4xIR682PLV VLUTRvMDSpsnEpxD0ckTjlehmzTYGNlDy9zZ/7M3YkdWL/YYqSQD/fY6PfXYezCeXQm0Nx AiBR0ImqUtZgnMhRaD9WQ7OYNWO7q+YVpA4zQoFk6/V8iJrSc2Q5BZtkODcqUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676364244; a=rsa-sha256; cv=none; b=WeC3fCIMAEZFHlU9IcCONi3FCa+bZZKPMgFkBAwLJ5Pn1Sj4Kn63BBzlK3luWLKsJyD5L4 pLYoyBOACSbyzW923WaYm5JdItDYmSET2R4tqLrR3ZWSrShBgw10f82DBKXuz+sXW7Z+a3 JbqBnDJMbcWkKkgrJc4f2zO4nkoucVJLI/Ni0tL95Fm9gTRBWf3RJZlASgT2k4m/+vk6EE PQO/Nu7Ys3CYRsZ7+7MheKXg2LGmjCZmpieB7T9UNc8SVGGeqO1Tst2Iu/L+dCHFtIHyuE XMEYEV36+TrFnkVzaqnLbxHPXl4ZJWlOoHGe5bpViuxk3fXMaKvgeKwxiGa99Q== 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 4PGF9v67fHzsc5; Tue, 14 Feb 2023 08:44:03 +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 31E8i3rL057068; Tue, 14 Feb 2023 08:44:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31E8i3K1057067; Tue, 14 Feb 2023 08:44:03 GMT (envelope-from git) Date: Tue, 14 Feb 2023 08:44:03 GMT Message-Id: <202302140844.31E8i3K1057067@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: a03e3a2f72b4 - main - devel/hp48xgcc: unbreak the port's build against 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: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a03e3a2f72b4ec44072e20e921672ddcff05e835 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=a03e3a2f72b4ec44072e20e921672ddcff05e835 commit a03e3a2f72b4ec44072e20e921672ddcff05e835 Author: Alexey Dokuchaev AuthorDate: 2023-02-14 08:42:04 +0000 Commit: Alexey Dokuchaev CommitDate: 2023-02-14 08:42:04 +0000 devel/hp48xgcc: unbreak the port's build against Clang 15 - Implement variadic function fatal() using API - While here, respect the user's preferred compiler ${CC} Obtained from: gcc-2.95.2.1 Reported by: pkg-fallout --- devel/hp48xgcc/Makefile | 2 ++ devel/hp48xgcc/files/patch-gcc-genattr.c | 38 ++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/devel/hp48xgcc/Makefile b/devel/hp48xgcc/Makefile index 6a47ae030f83..4aa2d5680ead 100644 --- a/devel/hp48xgcc/Makefile +++ b/devel/hp48xgcc/Makefile @@ -37,6 +37,8 @@ post-extract: .SILENT ${TAR} xzf ${_DISTDIR}/gcc-${GCC_VER}.tar.gz -C ${WRKDIR} # Patch GCC a bit ${PATCH} -d ${GCC_DIR} -s < ${WRKSRC}/gcc-target/patches-${GCC_VER} +# Respect user's preferred compiler + ${REINPLACE_CMD} -e 's,CC = cc,CC = ${CC},' ${GCC_DIR}/Makefile.in # Prepare GCC by creating proper config symlink ${LN} -sf ../../saturn/gcc-target/config-saturn ${GCC_DIR}/config/saturn # Allow GCC to build in our environment diff --git a/devel/hp48xgcc/files/patch-gcc-genattr.c b/devel/hp48xgcc/files/patch-gcc-genattr.c new file mode 100644 index 000000000000..2d9d8ac1768e --- /dev/null +++ b/devel/hp48xgcc/files/patch-gcc-genattr.c @@ -0,0 +1,38 @@ +--- ../gcc-2.7.2/genattr.c.orig 1995-06-15 11:38:53 UTC ++++ ../gcc-2.7.2/genattr.c +@@ -20,6 +20,7 @@ the Free Software Foundation, 59 Temple Place - Suite + Boston, MA 02111-1307, USA. */ + + ++#include + #include + #include "hconfig.h" + #include "rtl.h" +@@ -35,7 +36,7 @@ extern void free PROTO((void *)); + extern rtx read_rtx PROTO((FILE *)); + + char *xmalloc PROTO((unsigned)); +-static void fatal (); ++static void fatal PVPROTO ((const char *, ...)); + void fancy_abort PROTO((void)); + + /* A range of values. */ +@@ -214,11 +215,15 @@ xrealloc (ptr, size) + } + + static void +-fatal (s, a1, a2) +- char *s; ++fatal VPROTO ((const char *format, ...)) + { ++ va_list ap; ++ ++ VA_START (ap, format); ++ + fprintf (stderr, "genattr: "); +- fprintf (stderr, s, a1, a2); ++ vfprintf (stderr, format, ap); ++ va_end (ap); + fprintf (stderr, "\n"); + exit (FATAL_EXIT_CODE); + }