Date: Tue, 15 Aug 2023 01:41:41 GMT From: Li-Wen Hsu <lwhsu@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: f565698366db - main - lang/sdcc: Fix build if binutils is installed Message-ID: <202308150141.37F1ffv4039924@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/ports/commit/?id=f565698366db8cb2e990f24346416c3f9bf2d0de commit f565698366db8cb2e990f24346416c3f9bf2d0de Author: Daniel O'Connor <doconnor@gsoft.com.au> AuthorDate: 2023-08-15 01:40:43 +0000 Commit: Li-Wen Hsu <lwhsu@FreeBSD.org> 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 <stdio.h> 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 <sys/types.h> /* For size_t. */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202308150141.37F1ffv4039924>