Skip to content

Commit 9810245

Browse files
committed
Use zeromq2-1 repo and v2.1.4 by default
1 parent 32a7039 commit 9810245

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

Makefile

+4-3
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,16 @@ else
77
ZMQ_FLAGS=
88
endif
99

10-
ifeq ($(ZEROMQ_VERSION),"")
11-
ZEROMQ_VERSION=master
10+
ifndef ZEROMQ_VERSION
11+
ZEROMQ_VERSION=v2.1.4
1212
endif
1313

1414
all: perf
1515

1616
deps/zeromq2:
1717
@mkdir -p deps
18-
@git clone git://github.com/zeromq/zeromq2.git deps/zeromq2
18+
@git clone git://github.com/zeromq/zeromq2-1.git deps/zeromq2
19+
@echo $(ZEROMQ_VERSION)
1920
@cd deps/zeromq2 && git checkout $(ZEROMQ_VERSION)
2021

2122
deps/zeromq2/src/.libs/libzmq.a: deps/zeromq2

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ It is also available on [Agner](http://erlagner.org/):
2121

2222
$ agner build erlzmq
2323

24-
In order to build erlzmq2 against a specific version of ZeroMQ (not `master`), use this:
24+
In order to build erlzmq2 against a specific version of ZeroMQ (not `v2.1.4`), use this:
2525

2626
$ ZEROMQ_VERSION=v<VERSION> agner build erlzmq
2727

@@ -32,7 +32,7 @@ Build the code
3232

3333
$ make
3434

35-
If you want to build against a specific version of ZeroMQ (not `master`), use this:
35+
If you want to build against a specific version of ZeroMQ (not `v2.1.4`), use this:
3636

3737
$ ZEROMQ_VERSION=v<VERSION> make
3838

doc/overview.edoc

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ It is also available on [http://erlagner.org/ Agner]:
3333
$ agner build erlzmq
3434
'''
3535

36-
In order to build erlzmq2 against a specific version of ZeroMQ (not 'master'), use this:
36+
In order to build erlzmq2 against a specific version of ZeroMQ (not 'v2.1.4'), use this:
3737

3838
```
3939
$ ZEROMQ_VERSION=v<VERSION> agner build erlzmq
@@ -46,7 +46,7 @@ Build the code
4646
$ make
4747
'''
4848

49-
If you want to build against a specific version of ZeroMQ (not 'master'), use this:
49+
If you want to build against a specific version of ZeroMQ (not 'v2.1.4'), use this:
5050

5151
```
5252
$ ZEROMQ_VERSION=v<VERSION> make

0 commit comments

Comments
 (0)