Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Override for core 0 14 1 #107

Open
wants to merge 1 commit into
base: 6
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 75 additions & 0 deletions packages/core.v0.14.1/files/winpatch.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
--- ./src/dune
+++ ./src/dune
@@ -1,6 +1,6 @@
(rule (targets config.h thread_id.h) (deps)
(action
- (bash "cp %{lib:jst-config:config.h} %{lib:jst-config:thread_id.h} .")))
+ (bash "cp '%{lib:jst-config:config.h}' '%{lib:jst-config:thread_id.h}' .")))

(library (name core) (public_name core)
(libraries core_kernel.caml_unix core_kernel core_kernel.base_for_tests
--- ./bigstring_unix/src/dune
+++ ./bigstring_unix/src/dune
@@ -3,7 +3,7 @@
(preprocessor_deps config.h) (preprocess (pps ppx_jane)))

(rule (targets config.h) (deps)
- (action (bash "cp %{lib:jst-config:config.h} .")))
+ (action (bash "cp '%{lib:jst-config:config.h}' .")))

(rule (targets socketaddr.h) (deps)
- (action (bash "cp %{lib:core:socketaddr.h} .")))
\ No newline at end of file
+ (action (bash "cp '%{lib:core:socketaddr.h}' .")))
\ No newline at end of file
--- ./iobuf_unix/src/dune
+++ ./iobuf_unix/src/dune
@@ -4,4 +4,4 @@
(preprocess (pps ppx_jane)))

(rule (targets config.h) (deps)
- (action (bash "cp %{lib:jst-config:config.h} .")))
\ No newline at end of file
+ (action (bash "cp '%{lib:jst-config:config.h}' .")))
\ No newline at end of file
--- ./linux_ext/src/dune
+++ ./linux_ext/src/dune
@@ -3,4 +3,4 @@
(preprocessor_deps config.h) (preprocess (pps ppx_jane)))

(rule (targets config.h) (deps)
- (action (bash "cp %{lib:jst-config:config.h} .")))
\ No newline at end of file
+ (action (bash "cp '%{lib:jst-config:config.h}' .")))
\ No newline at end of file
--- ./time_stamp_counter/src/dune
+++ ./time_stamp_counter/src/dune
@@ -4,4 +4,4 @@
(libraries core))

(rule (targets config.h) (deps)
- (action (bash "cp %{lib:jst-config:config.h} %{targets}")))
\ No newline at end of file
+ (action (bash "cp '%{lib:jst-config:config.h}' %{targets}")))
\ No newline at end of file
--- ./src/dune
+++ ./src/dune
@@ -6,7 +6,7 @@
(libraries core_kernel.caml_unix core_kernel core_kernel.base_for_tests
error_checking_mutex core_kernel.flags sexplib.unix spawn timezone threads
core_kernel.version_util)
- (c_flags (:standard -D_LARGEFILE64_SOURCE) ()) (install_c_headers config)
+ (c_flags (:standard -D_LARGEFILE64_SOURCE -I/usr/include) ()) (install_c_headers config)
(c_names ocaml_utils_stubs pthread_np_stubs signal_stubs timespec unix_stubs
unix_time_stubs nss_stubs)
(preprocessor_deps config.h)
--- ./syslog/src/dune
+++ ./syslog/src/dune
@@ -1,2 +1,2 @@
(library (name syslog) (public_name core.syslog) (libraries core)
- (c_names syslog_stubs) (preprocess (pps ppx_jane)))
\ No newline at end of file
+ (c_flags (:standard -I/usr/include)) (c_names syslog_stubs) (preprocess (pps ppx_jane)))
\ No newline at end of file


10 changes: 10 additions & 0 deletions packages/core.v0.14.1/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"build": [
[
"bash",
"-c",
"#{os == 'windows' ? 'patch -p1 < winpatch.patch' : 'true' }"
],
"dune build -p core -j 4"
]
}