diff --git a/sdk_container/src/third_party/coreos-overlay/sys-devel/make/README.md b/sdk_container/src/third_party/coreos-overlay/sys-devel/make/README.md new file mode 100644 index 0000000000..6eed06d4d8 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-devel/make/README.md @@ -0,0 +1,2 @@ +We forked this package to carry a patch that we will try to upstream +to both GNU Make and to Gentoo. diff --git a/sdk_container/src/third_party/coreos-overlay/sys-devel/make/files/make-4.3-handle-tmpfile-fail.patch b/sdk_container/src/third_party/coreos-overlay/sys-devel/make/files/make-4.3-handle-tmpfile-fail.patch new file mode 100644 index 0000000000..340b744673 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-devel/make/files/make-4.3-handle-tmpfile-fail.patch @@ -0,0 +1,23 @@ +diff -u -r make-4.3/src/output.c make-4.3-fix/src/output.c +--- make-4.3/src/output.c 2020-01-03 07:11:27.000000000 -0000 ++++ make-4.3-fix/src/output.c 2022-08-17 07:35:01.473471281 -0000 +@@ -286,15 +286,16 @@ + FILE *tfile = tmpfile (); + + if (! tfile) +- pfatal_with_name ("tmpfile"); ++ return -1; + + /* Create a duplicate so we can close the stream. */ + fd = dup (fileno (tfile)); +- if (fd < 0) +- pfatal_with_name ("dup"); + + fclose (tfile); + ++ if (fd < 0) ++ return -1; ++ + set_append_mode (fd); + + umask (mask); diff --git a/sdk_container/src/third_party/coreos-overlay/sys-devel/make/make-4.3.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-devel/make/make-4.3.ebuild index 50caf0365b..533a77aceb 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-devel/make/make-4.3.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-devel/make/make-4.3.ebuild @@ -30,6 +30,7 @@ RDEPEND="${DEPEND} PATCHES=( "${FILESDIR}"/${PN}-3.82-darwin-library_search-dylib.patch "${FILESDIR}"/${PN}-4.2-default-cxx.patch + "${FILESDIR}"/${PN}-4.3-handle-tmpfile-fail.patch ) src_configure() {