Skip to content

Commit 7bf1234

Browse files
committed
Fix compiling with newer libzmq version
1 parent 2a5bf34 commit 7bf1234

File tree

6 files changed

+13
-34
lines changed

6 files changed

+13
-34
lines changed

.travis.yml

-15
This file was deleted.

README.md

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
[![Build Status](https://travis-ci.org/zeromq/mruby-zmq.svg?branch=master)](https://travis-ci.org/zeromq/mruby-zmq)
2-
31
# mruby-zmq
42
mruby bindings for https://github.com/zeromq/libzmq (v4)
53

Rakefile

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
MRUBY_CONFIG=File.expand_path(ENV["MRUBY_CONFIG"] || "build_config.rb")
22

33
file :mruby do
4-
sh "git clone --depth=1 git://github.com/mruby/mruby.git"
4+
sh "git clone --recurse-submodules --depth=1 https://github.com/mruby/mruby.git"
5+
sh "git submodule update --init --recursive"
56
end
67

78
desc "test"

build_config.rb.lock

+9-14
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,22 @@
11
---
22
mruby:
3-
version: 3.0.0
4-
release_no: 30000
5-
git_commit: eaaa9148b532a60daf92dfde1c37530194f2060d
3+
version: 3.3.0
4+
release_no: 30300
5+
git_commit: 9257a61b39d7825ba40efd693e3fa3d588f407d8
66
builds:
77
host:
8-
https://github.com/iij/mruby-errno.git:
9-
url: https://github.com/iij/mruby-errno.git
10-
branch: HEAD
11-
commit: b4415207ff6ea62360619c89a1cff83259dc4db0
12-
version: 0.0.0
138
https://github.com/Asmod4n/mruby-proc-irep-ext.git:
149
url: https://github.com/Asmod4n/mruby-proc-irep-ext.git
15-
branch: HEAD
16-
commit: 66ec9ed10982ff03e998b51a8652c9bb2b75ec44
10+
branch: master
11+
commit: d52907a347c3ab63faa1592cd240bb9e5836dee8
1712
version: 0.0.0
1813
https://github.com/Asmod4n/mruby-simplemsgpack.git:
1914
url: https://github.com/Asmod4n/mruby-simplemsgpack.git
20-
branch: HEAD
21-
commit: 293a0c58c77b0b8fff0a5eef176ac9deb0d9cdc0
22-
version: '2.0'
15+
branch: master
16+
commit: b07b6b56839f1358a45909e15a31b54863aaf040
17+
version: '2.1'
2318
https://github.com/iij/mruby-env.git:
2419
url: https://github.com/iij/mruby-env.git
25-
branch: HEAD
20+
branch: master
2621
commit: 056ae324451ef16a50c7887e117f0ea30921b71b
2722
version: 0.0.0

deps/libzmq

Submodule libzmq updated 866 files

mrbgem.rake

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ MRuby::Gem::Specification.new('mruby-zmq') do |spec|
1919
def build_libzmq(spec, build)
2020
unless File.exists?("#{spec.build_dir}/build/lib/libzmq.a")
2121
warn "mruby-zmq: cannot find libzmq, building it"
22-
sh "mkdir -p #{spec.build_dir}/build && cd #{spec.build_dir}/build && cmake -DCMAKE_INSTALL_PREFIX=\"#{spec.build_dir}\" -DWITH_LIBBSD=OFF -DWITH_LIBSODIUM=OFF -DWITH_TLS=OFF -DENABLE_DRAFTS=ON #{spec.dir}/deps/libzmq/ && cmake --build . -j4 --target libzmq-static"
22+
sh "mkdir -p #{spec.build_dir}/build && cd #{spec.build_dir}/build && cmake -DCMAKE_INSTALL_PREFIX=\"#{spec.build_dir}\" -DWITH_LIBSODIUM=OFF -DENABLE_CURVE=ON -DENABLE_DRAFTS=ON #{spec.dir}/deps/libzmq/ && cmake --build . -j4 --target libzmq-static"
2323
end
2424
spec.linker.flags_before_libraries << "\"#{spec.build_dir}/build/lib/libzmq.a\""
2525
`pkg-config --cflags \"#{spec.build_dir}/build/libzmq.pc\"`.split("\s").each do |cflag|

0 commit comments

Comments
 (0)