From 293e4fdce551597f8fa0909d19294b0be62fa964 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Sat, 3 Jul 2021 16:38:52 +0200 Subject: [PATCH] Backport fix for Julia 1.7.0-beta2 headers Taken from https://github.com/JuliaLang/julia/pull/41308, this is necessary in order to actually build C code against libjulia. --- L/libjulia/libjulia@1.7/build_tarballs.jl | 1 + .../patches/0002-support-julia-h.patch | 21 +++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 L/libjulia/libjulia@1.7/bundled/patches/0002-support-julia-h.patch diff --git a/L/libjulia/libjulia@1.7/build_tarballs.jl b/L/libjulia/libjulia@1.7/build_tarballs.jl index f23a602cbf3..7da3f07cb97 100644 --- a/L/libjulia/libjulia@1.7/build_tarballs.jl +++ b/L/libjulia/libjulia@1.7/build_tarballs.jl @@ -1,2 +1,3 @@ include("../common.jl") build_julia(ARGS, v"1.7.0-beta2") + diff --git a/L/libjulia/libjulia@1.7/bundled/patches/0002-support-julia-h.patch b/L/libjulia/libjulia@1.7/bundled/patches/0002-support-julia-h.patch new file mode 100644 index 00000000000..b8c517a1486 --- /dev/null +++ b/L/libjulia/libjulia@1.7/bundled/patches/0002-support-julia-h.patch @@ -0,0 +1,21 @@ +commit 1b20d2b3aa6dedfba875895adcde86cb668253e5 +Author: Sacha Verweij +Date: 2021-06-21 18:05:57 -0400 + + Fix inability to find support/{platform,dirpath}.h from julia_fasttls.h. + +diff --git a/src/julia_fasttls.h b/src/julia_fasttls.h +index 0dc0c05c82..3930a6d8a2 100644 +--- a/src/julia_fasttls.h ++++ b/src/julia_fasttls.h +@@ -10,8 +10,8 @@ extern "C" { + #endif + + /* Bring in definitions for `_OS_X_`, `PATH_MAX` and `PATHSEPSTRING`, `jl_ptls_t`, etc... */ +-#include "support/platform.h" +-#include "support/dirpath.h" ++#include "platform.h" ++#include "dirpath.h" + + typedef struct _jl_gcframe_t jl_gcframe_t; +