Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

support pulling zmq3.1 in c_src makefile

  • Loading branch information...
commit 08fe70c795127069156b4c903996e566e0ad250e 1 parent 4b17cb0
@ericbmerritt ericbmerritt authored
Showing with 12 additions and 12 deletions.
  1. +9 −9 c_src/Makefile
  2. +3 −3 rebar.config
View
18 c_src/Makefile
@@ -8,14 +8,14 @@ ZMQ_FLAGS=
endif
ifndef ZEROMQ_VERSION
-ZEROMQ_VERSION=v2.1.11
+ZEROMQ_VERSION=v3.1.0
endif
-all: $(DEPS)/zeromq2/src/.libs/libzmq.a
+all: $(DEPS)/zeromq3/src/.libs/libzmq.a
clean:
- if test -e $(DEPS)/zeromq2/Makefile; then \
- cd $(DEPS)/zeromq2; make clean; \
+ if test -e $(DEPS)/zeromq3/Makefile; then \
+ cd $(DEPS)/zeromq3; make clean; \
else \
true; \
fi
@@ -23,11 +23,11 @@ clean:
distclean:
@rm -rf $(DEPS)
-$(DEPS)/zeromq2:
+$(DEPS)/zeromq3:
@mkdir $(DEPS)
- @git clone git://github.com/zeromq/zeromq2-1.git $(DEPS)/zeromq2
+ @git clone git://github.com/zeromq/libzmq.git $(DEPS)/zeromq3
@echo $(ZEROMQ_VERSION)
- @cd $(DEPS)/zeromq2 && git checkout $(ZEROMQ_VERSION)
+ @cd $(DEPS)/zeromq3 && git checkout $(ZEROMQ_VERSION)
-$(DEPS)/zeromq2/src/.libs/libzmq.a: $(DEPS)/zeromq2
- @cd $(DEPS)/zeromq2 && ./autogen.sh && ./configure $(ZMQ_FLAGS) && make
+$(DEPS)/zeromq3/src/.libs/libzmq.a: $(DEPS)/zeromq3
+ @cd $(DEPS)/zeromq3 && ./autogen.sh && ./configure $(ZMQ_FLAGS) && make
View
6 rebar.config
@@ -1,9 +1,9 @@
{erl_opts, [debug_info, warnings_as_errors]}.
{port_envs,
- [{"DRV_LDFLAGS","deps/zeromq2/src/.libs/libzmq.a -shared $ERL_LDFLAGS -lstdc++ -luuid"},
- {"darwin", "DRV_LDFLAGS", "deps/zeromq2/src/.libs/libzmq.a -bundle -flat_namespace -undefined suppress $ERL_LDFLAGS"},
- {"DRV_CFLAGS","-Ic_src -Ideps/zeromq2/include -g -Wall -fPIC $ERL_CFLAGS"}]}.
+ [{"DRV_LDFLAGS","deps/zeromq3/src/.libs/libzmq.a -shared $ERL_LDFLAGS -lstdc++"},
+ {"darwin", "DRV_LDFLAGS", "deps/zeromq3/src/.libs/libzmq.a -bundle -flat_namespace -undefined suppress $ERL_LDFLAGS"},
+ {"DRV_CFLAGS","-Ic_src -Ideps/zeromq3/include -g -Wall -fPIC $ERL_CFLAGS"}]}.
{pre_hooks,[{compile,"make -C c_src"},
{clean, "make -C c_src clean"}]}.
Please sign in to comment.
Something went wrong with that request. Please try again.