From 19d05ecc0ec08f063d21159e56ddc83d9b99fae3 Mon Sep 17 00:00:00 2001 From: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Date: Mon, 8 Jul 2024 01:13:00 +0200 Subject: [PATCH 1/2] GN-121467: Fix makefile to include mimalloc headers --- Makefile.pre.in | 4 ++-- .../next/C API/2024-07-08-01-11-54.gh-issue-121467.3qWRQj.rst | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 Misc/NEWS.d/next/C API/2024-07-08-01-11-54.gh-issue-121467.3qWRQj.rst diff --git a/Makefile.pre.in b/Makefile.pre.in index 94cfb74138a3d9..0bece8717ef4c0 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -2652,7 +2652,7 @@ inclinstall: $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$(INCLUDEPY)/internal; \ else true; \ fi - @if test "$(INSTALL_MIMALLOC)" == "yes"; then \ + @if test "$(INSTALL_MIMALLOC)" = "yes"; then \ if test ! -d $(DESTDIR)$(INCLUDEPY)/internal/mimalloc/mimalloc; then \ echo "Creating directory $(DESTDIR)$(INCLUDEPY)/internal/mimalloc/mimalloc"; \ $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$(INCLUDEPY)/internal/mimalloc/mimalloc; \ @@ -2673,7 +2673,7 @@ inclinstall: echo $(INSTALL_DATA) $$i $(INCLUDEPY)/internal; \ $(INSTALL_DATA) $$i $(DESTDIR)$(INCLUDEPY)/internal; \ done - @if test "$(INSTALL_MIMALLOC)" == "yes"; then \ + @if test "$(INSTALL_MIMALLOC)" = "yes"; then \ echo $(INSTALL_DATA) $(srcdir)/Include/internal/mimalloc/mimalloc.h $(DESTDIR)$(INCLUDEPY)/internal/mimalloc/mimalloc.h; \ $(INSTALL_DATA) $(srcdir)/Include/internal/mimalloc/mimalloc.h $(DESTDIR)$(INCLUDEPY)/internal/mimalloc/mimalloc.h; \ for i in $(srcdir)/Include/internal/mimalloc/mimalloc/*.h; \ diff --git a/Misc/NEWS.d/next/C API/2024-07-08-01-11-54.gh-issue-121467.3qWRQj.rst b/Misc/NEWS.d/next/C API/2024-07-08-01-11-54.gh-issue-121467.3qWRQj.rst new file mode 100644 index 00000000000000..14e7e1f1117327 --- /dev/null +++ b/Misc/NEWS.d/next/C API/2024-07-08-01-11-54.gh-issue-121467.3qWRQj.rst @@ -0,0 +1 @@ +Fix makefile to include mimalloc headers. From e505dae0471fc68427ce8e1af7b4a9df2fc90c08 Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Mon, 8 Jul 2024 01:21:15 +0200 Subject: [PATCH 2/2] Amend NEWS wording and category --- .../next/Build/2024-07-08-01-11-54.gh-issue-121467.3qWRQj.rst | 1 + .../next/C API/2024-07-08-01-11-54.gh-issue-121467.3qWRQj.rst | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 Misc/NEWS.d/next/Build/2024-07-08-01-11-54.gh-issue-121467.3qWRQj.rst delete mode 100644 Misc/NEWS.d/next/C API/2024-07-08-01-11-54.gh-issue-121467.3qWRQj.rst diff --git a/Misc/NEWS.d/next/Build/2024-07-08-01-11-54.gh-issue-121467.3qWRQj.rst b/Misc/NEWS.d/next/Build/2024-07-08-01-11-54.gh-issue-121467.3qWRQj.rst new file mode 100644 index 00000000000000..a2238475546eaa --- /dev/null +++ b/Misc/NEWS.d/next/Build/2024-07-08-01-11-54.gh-issue-121467.3qWRQj.rst @@ -0,0 +1 @@ +Fix a Makefile bug that prevented mimalloc header files from being installed. diff --git a/Misc/NEWS.d/next/C API/2024-07-08-01-11-54.gh-issue-121467.3qWRQj.rst b/Misc/NEWS.d/next/C API/2024-07-08-01-11-54.gh-issue-121467.3qWRQj.rst deleted file mode 100644 index 14e7e1f1117327..00000000000000 --- a/Misc/NEWS.d/next/C API/2024-07-08-01-11-54.gh-issue-121467.3qWRQj.rst +++ /dev/null @@ -1 +0,0 @@ -Fix makefile to include mimalloc headers.