Skip to content

Commit

Permalink
Backport fix for Julia 1.7.0-beta2 headers
Browse files Browse the repository at this point in the history
Taken from JuliaLang/julia#41308, this is
necessary in order to actually build C code against libjulia.
  • Loading branch information
fingolfin committed Jul 3, 2021
1 parent a1212d0 commit 0a64d7f
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 0 deletions.
1 change: 1 addition & 0 deletions L/libjulia/libjulia@1.7/build_tarballs.jl
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
include("../common.jl")
build_julia(ARGS, v"1.7.0-beta2")

21 changes: 21 additions & 0 deletions L/libjulia/libjulia@1.7/bundled/patches/0002-support-julia-h.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
commit 1b20d2b3aa6dedfba875895adcde86cb668253e5
Author: Sacha Verweij <sacha.verweij@alumni.stanford.edu>
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;

0 comments on commit 0a64d7f

Please sign in to comment.