From nobody Mon Jun 26 23:30:48 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 4Qqkc900g2z4kNK2; Mon, 26 Jun 2023 23:30:49 +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 4Qqkc85JP8z3wp1; Mon, 26 Jun 2023 23:30:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687822248; 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=248GzehC55lbN5PX0CiOHydP5KCUoM7DfQaVhQ84jYc=; b=rdwQq5gPumdomUzoD6F7IDMDUYxbRSqHRVnCeqRK1uxbGGbLGOjFsFvUdF3s9R2srLZzg+ 9XVQOVzD8h16654+t+Ud8lN3N/XeDNgog+lxyWdFcX3V9wOpFMj2vggUSAzdHvBCI1m0VZ i13UEVsSZgyhs1tOMUNQR2/yldckBg+HgcPNyb0vzQULc52SiFcTskhusc5vPcJRH2bGe5 3UPaomMjg7Jp6irZLyvMeAgVRQ5HBxXyN1rG/1alZC7zTaQ8X64xk0ZV4uWwoT7nr4gUb8 GrY1I24MBoV5byFOdZhQJfN7I5BOmzMD3svBfR1EdxTPzCI6j9wodUVY+Kc1PA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687822248; 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=248GzehC55lbN5PX0CiOHydP5KCUoM7DfQaVhQ84jYc=; b=Yu5RUjaGGIT1GxBU3CefBHqlTnIHNOD3Tpfv807wRhJQusq40dR4i4pNIqJzyYq5HTCZLA o2vAYZzG4H+oXxeN+lneRhYc7243Gndv3e8Kdt7lFoGB2OnRA6uBClukRT1uhQ5NBGulLs 2clrq28UODH/z2qwrvMtlZe6jAR+L4HCst26f/I32FYc3jA6sD+UOGidOQtZRZ/DdG0Yi9 U8ofzNawmwy6pkUGFJiQLKg9v3PXv2RSHsiyDKJOCpS5KBBpZftQTtHEgs5gdRKA9T99Th z9GM0UOhdCcUIVrC020Nni31MUvEBioGEZS/PmN/JJRYXO+ZyFVgMnnL+Ntt8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687822248; a=rsa-sha256; cv=none; b=QNc3rXcq43k4bVJkf2KxcFEC4jfqeYnQYTQ17JbBjKYRNfRGE8rf/Uj3KbdzVz6b0ZbtpP mt0G5pG2o0WVwAT+ySb7tW29mRdrji1qlx9XB+8q68n53sT4/wEDI7KkOvH0GrgEQ/4Qur wa7z1a/L+XJVzqYJU3g785gKF8HeRJ6yM3/85mRj4VKpJbD7Q8upFV9WaJKnCQSm3qmvKK bPAjvxLN/g10yOv+/6qPqlcKyyfNbFflMiNlmSPL2AXhqq2aXmxhaXdKjIK/WeZ9tjQTZc zzPESogGA++AGCPwGIZ9XYWswZHlp/8tN0jMwxKP6alJxgQkGqt3BAfEDUGX8g== 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 4Qqkc842LRzVCb; Mon, 26 Jun 2023 23:30:48 +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 35QNUm3k025792; Mon, 26 Jun 2023 23:30:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35QNUmf7025791; Mon, 26 Jun 2023 23:30:48 GMT (envelope-from git) Date: Mon, 26 Jun 2023 23:30:48 GMT Message-Id: <202306262330.35QNUmf7025791@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: cb61cd8b665e - main - devel/orc: work around armv7 libc bug 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: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cb61cd8b665eccd6764df0ecae01dcaa4b8f5b5f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=cb61cd8b665eccd6764df0ecae01dcaa4b8f5b5f commit cb61cd8b665eccd6764df0ecae01dcaa4b8f5b5f Author: Robert Clausecker AuthorDate: 2023-06-26 19:43:25 +0000 Commit: Robert Clausecker CommitDate: 2023-06-26 23:30:29 +0000 devel/orc: work around armv7 libc bug The armv7 libc has a bug in printf() where printing a denormal double may cause NUL bytes to be written out. This port tries to write a diagnostic comment containing such a denormal to a C source file. The bug causes the source file to be malformed, breaking the port and its consumers. Work around the bug by killing the offending part of the diagnostic comment. Approved by: portmgr (build fix blanket) Reviewed by: diizzy PR: 272229 --- devel/orc/Makefile | 1 + devel/orc/files/patch-orc_orcprogram-c.c | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/devel/orc/Makefile b/devel/orc/Makefile index 3ebbd84bf732..d7f331d03bd6 100644 --- a/devel/orc/Makefile +++ b/devel/orc/Makefile @@ -1,5 +1,6 @@ PORTNAME= orc DISTVERSION= 0.4.34 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://gstreamer.freedesktop.org/data/src/orc/ diff --git a/devel/orc/files/patch-orc_orcprogram-c.c b/devel/orc/files/patch-orc_orcprogram-c.c new file mode 100644 index 000000000000..e97ca08db3a7 --- /dev/null +++ b/devel/orc/files/patch-orc_orcprogram-c.c @@ -0,0 +1,19 @@ +This patch works around a bug in the armv7 libc where sprintf(buf, "%g", 1.26e-321); +generates a string with an embedded NUL byte, causing broken source code to be +generated (PR272229). + +--- orc/orcprogram-c.c.orig 2023-06-26 19:40:12 UTC ++++ orc/orcprogram-c.c +@@ -825,10 +825,9 @@ c_rule_loadpX (OrcCompiler *p, void *user, OrcInstruct + } + } else if (p->vars[insn->src_args[0]].vartype == ORC_VAR_TYPE_CONST) { + if (p->vars[insn->src_args[0]].size <= 4) { +- ORC_ASM_CODE(p," %s = 0x%08x; /* %d or %gf */\n", dest, ++ ORC_ASM_CODE(p," %s = 0x%08x; /* %d */\n", dest, + (unsigned int)p->vars[insn->src_args[0]].value.i, +- (int)p->vars[insn->src_args[0]].value.i, +- p->vars[insn->src_args[0]].value.f); ++ (int)p->vars[insn->src_args[0]].value.i); + } else { + ORC_ASM_CODE(p," %s = ORC_UINT64_C(0x%08x%08x); /* %gf */\n", dest, + (orc_uint32)(((orc_uint64)p->vars[insn->src_args[0]].value.i)>>32),