From nobody Tue Aug 15 01:41:41 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 4RPvBZ23L9z4qCHs; Tue, 15 Aug 2023 01:41: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 4RPvBY6Hkvz3R6g; Tue, 15 Aug 2023 01:41:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692063701; 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=ea60iETKQbEcoo8Z99nYcB3x1lO2Lu2yVlrPiidXoCs=; b=X6JFrJgy1ZCypsRXOf7C1jOoApfqWYwqD6oSd18jDwyKu8Ox+zzyoThGAiszdJ2SJUhhfS g8n6ePcLL7Ho75/BaA6PI5iF64nOYYjjI3l62iqXFcvT0fretOTv+ZGLDSNO3QqxX9yuPd O2KbqF8SwAdpO3P0T7m9hl0YvFP67lLy5Lpzbezw3ZMhQdUrh5VjdrU/TErNVJOKoX2iZ1 R+SwAtM1tQ+XDkg6q2bx4PNv7+/HbSiWaAQvP9BB0ipzOBq/uUAAi7Pyuv8O+okaMtUccU 5rFtIAdbx8Q0mgAs5dVTWr3S8xca9YnSFWlp4ab+vbnBvteERFpj2zmDRM6lsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692063701; 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=ea60iETKQbEcoo8Z99nYcB3x1lO2Lu2yVlrPiidXoCs=; b=mfHkBo94PHE03B1eBXMMQPaB2AxjfjwAEzMzxeLfpshoz9IMo7dbrU0H+rfWJoqwFZYzFU KaNxS2LMCB1M3F9G7ByByLdZKJxZbRKdstSWz2BNtUYdzo1thKUMjv4w/AMI/D82RxjFOV U8J/2gLk0Hn0eDU4SGJlSaNZoULUf8kE0J9m5OFKQWVwmQQ9swKyYomBpGELR6Rodi0Efy /Ozv1w1OwtLnKa2TfJdg7NeIf7GErJT//U0Yv1NiGsfzIoo1smkmMdxFp67b4/FHHoAn3V vIip8bk8L+KQKh3fPFqNR/gsSAvW9rurcTa476v0vdxl2ilZTxCkwnwMzBCp5Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692063701; a=rsa-sha256; cv=none; b=dW2kwUwPcbBPSjWjs/S+aSrDJZTXE0/l1KUXLVUe5NAieeAomuQs2w4vXdS0hdeX3PIIGy f8tlFsHjchHqfvulLhQMRHYS/+y6OkSZhzXdbxZr6KX8xkXP13faF3wFKjAE5TGFv6meH1 epIe3vqFngkOVbfERSWT9uW0zZxrvKpblC9YkoDUKr/VJJEgQ/zbFwYf8lSbpPEpJTftBS bsBGdc0ctyjjyBhue+sMrKisIm/EuN2ivXvEF+i/sTavsZ6WxBgXGVohS9SmL4FF8OI1Fv BFIEe1d572gsiuZUmYr6Fpy/Jq2ub6EaHXXInEIvA90XwFjGdMtLz9v4s9nRBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RPvBY5MvHzrdQ; Tue, 15 Aug 2023 01:41:41 +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 37F1ffgO039927; Tue, 15 Aug 2023 01:41:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37F1ffv4039924; Tue, 15 Aug 2023 01:41:41 GMT (envelope-from git) Date: Tue, 15 Aug 2023 01:41:41 GMT Message-Id: <202308150141.37F1ffv4039924@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Li-Wen Hsu Subject: git: f565698366db - main - lang/sdcc: Fix build if binutils is installed 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: lwhsu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f565698366db8cb2e990f24346416c3f9bf2d0de Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/ports/commit/?id=f565698366db8cb2e990f24346416c3f9bf2d0de commit f565698366db8cb2e990f24346416c3f9bf2d0de Author: Daniel O'Connor AuthorDate: 2023-08-15 01:40:43 +0000 Commit: Li-Wen Hsu CommitDate: 2023-08-15 01:40:43 +0000 lang/sdcc: Fix build if binutils is installed binutils has ansidecls.h which gets picked up before the sdcc version which breaks the build. Patch the files which use it to use a relative path. PR: 273037 --- lang/sdcc/Makefile | 2 +- lang/sdcc/files/patch-support_sdbinutils_libiberty_objalloc.c | 11 +++++++++++ lang/sdcc/files/patch-support_sdbinutils_libiberty_spaces.c | 11 +++++++++++ lang/sdcc/files/patch-support_sdbinutils_libiberty_xatexit.c | 11 +++++++++++ lang/sdcc/files/patch-support_sdbinutils_libiberty_xmalloc.c | 11 +++++++++++ lang/sdcc/files/patch-support_sdbinutils_libiberty_xmemdup.c | 11 +++++++++++ 6 files changed, 56 insertions(+), 1 deletion(-) diff --git a/lang/sdcc/Makefile b/lang/sdcc/Makefile index 32653992caa4..1e13a750c458 100644 --- a/lang/sdcc/Makefile +++ b/lang/sdcc/Makefile @@ -1,7 +1,7 @@ PORTNAME= sdcc PORTVERSION= 4.0.0 DISTVERSIONPREFIX=src- -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= lang MASTER_SITES= SF diff --git a/lang/sdcc/files/patch-support_sdbinutils_libiberty_objalloc.c b/lang/sdcc/files/patch-support_sdbinutils_libiberty_objalloc.c new file mode 100644 index 000000000000..3449b8273bf6 --- /dev/null +++ b/lang/sdcc/files/patch-support_sdbinutils_libiberty_objalloc.c @@ -0,0 +1,11 @@ +--- support/sdbinutils/libiberty/objalloc.c.orig 2018-03-18 17:46:53 UTC ++++ support/sdbinutils/libiberty/objalloc.c +@@ -18,7 +18,7 @@ Foundation, 51 Franklin Street - Fifth Floor, + Boston, MA 02110-1301, USA. */ + + #include "config.h" +-#include "ansidecl.h" ++#include "../include/ansidecl.h" + + #include "objalloc.h" + diff --git a/lang/sdcc/files/patch-support_sdbinutils_libiberty_spaces.c b/lang/sdcc/files/patch-support_sdbinutils_libiberty_spaces.c new file mode 100644 index 000000000000..19ad34bd95e6 --- /dev/null +++ b/lang/sdcc/files/patch-support_sdbinutils_libiberty_spaces.c @@ -0,0 +1,11 @@ +--- support/sdbinutils/libiberty/spaces.c.orig 2018-03-18 17:46:53 UTC ++++ support/sdbinutils/libiberty/spaces.c +@@ -32,7 +32,7 @@ valid until at least the next call. + #ifdef HAVE_CONFIG_H + #include "config.h" + #endif +-#include "ansidecl.h" ++#include "../include/ansidecl.h" + #include "libiberty.h" + + #if VMS diff --git a/lang/sdcc/files/patch-support_sdbinutils_libiberty_xatexit.c b/lang/sdcc/files/patch-support_sdbinutils_libiberty_xatexit.c new file mode 100644 index 000000000000..f440cb01365d --- /dev/null +++ b/lang/sdcc/files/patch-support_sdbinutils_libiberty_xatexit.c @@ -0,0 +1,11 @@ +--- support/sdbinutils/libiberty/xatexit.c.orig 2012-02-10 10:16:50 UTC ++++ support/sdbinutils/libiberty/xatexit.c +@@ -25,7 +25,7 @@ failure. If you use @code{xatexit} to register functi + #ifdef HAVE_CONFIG_H + #include "config.h" + #endif +-#include "ansidecl.h" ++#include "../include/ansidecl.h" + #include "libiberty.h" + + #include diff --git a/lang/sdcc/files/patch-support_sdbinutils_libiberty_xmalloc.c b/lang/sdcc/files/patch-support_sdbinutils_libiberty_xmalloc.c new file mode 100644 index 000000000000..6e74a19f5456 --- /dev/null +++ b/lang/sdcc/files/patch-support_sdbinutils_libiberty_xmalloc.c @@ -0,0 +1,11 @@ +--- support/sdbinutils/libiberty/xmalloc.c.orig 2018-03-18 17:46:53 UTC ++++ support/sdbinutils/libiberty/xmalloc.c +@@ -63,7 +63,7 @@ function will be called to print an error message and + #ifdef HAVE_CONFIG_H + #include "config.h" + #endif +-#include "ansidecl.h" ++#include "../include/ansidecl.h" + #include "libiberty.h" + #include "environ.h" + diff --git a/lang/sdcc/files/patch-support_sdbinutils_libiberty_xmemdup.c b/lang/sdcc/files/patch-support_sdbinutils_libiberty_xmemdup.c new file mode 100644 index 000000000000..ad481b893f51 --- /dev/null +++ b/lang/sdcc/files/patch-support_sdbinutils_libiberty_xmemdup.c @@ -0,0 +1,11 @@ +--- support/sdbinutils/libiberty/xmemdup.c.orig 2018-03-18 17:46:53 UTC ++++ support/sdbinutils/libiberty/xmemdup.c +@@ -19,7 +19,7 @@ allocated, the remaining memory is zeroed. + #ifdef HAVE_CONFIG_H + #include "config.h" + #endif +-#include "ansidecl.h" ++#include "../include/ansidecl.h" + #include "libiberty.h" + + #include /* For size_t. */