Skip to content

Commit c9de43f

Browse files
committed
use latest cre2 release, verify checksums of re2 and cre2
1 parent eaedfb3 commit c9de43f

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

Makefile

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,26 +62,28 @@ $(EXTERNALS)/pypy: $(EXTERNALS)
6262
$(EXTERNALS)/re2: $(EXTERNALS)
6363
cd $(EXTERNALS) && \
6464
curl -sL https://github.com/google/re2/archive/2016-02-01.tar.gz > re2.tar.gz && \
65+
shasum -a 256 cre2.tar.xz | grep -q f246c43897ac341568a7460622138ec0dd8de9b6f5459686376fa23e9d8c1bb8 && \
6566
mkdir -p re2 && \
6667
cd re2 && \
6768
tar -zxf ../re2.tar.gz --strip-components=1
6869

6970
$(EXTERNALS)/re2/obj/libre2.a: $(EXTERNALS)/re2
7071
cd $(EXTERNALS)/re2 && make
7172

72-
$(EXTERNALS)/cre2:
73+
$(EXTERNALS)/cre2: $(EXTERNALS)
7374
cd $(EXTERNALS) && \
74-
curl -sL https://github.com/keymone/cre2/archive/f1157647f9ca3ef11fd6447433f36e7c7bd64d09.tar.gz > cre2.tar.xz && \
75+
curl -sL https://bitbucket.org/marcomaggi/cre2/downloads/cre2-0.2.0.tar.xz > cre2.tar.xz && \
76+
shasum -a 256 cre2.tar.xz | grep -q d31118dbc9d2b1cf95c1b763ca92ae2ec4e262b1f8d8e995c1ffdc8eb40a82fc && \
7577
mkdir -p cre2 && \
7678
cd cre2 && \
7779
tar -zxf ../cre2.tar.xz --strip-components=1
7880

7981
$(EXTERNALS)/cre2/build/.libs/libcre2.a: $(EXTERNALS)/cre2
8082
cd $(EXTERNALS)/cre2 && \
81-
LIBTOOLIZE=`env which -a libtoolize glibtoolize | head -n1` sh autogen.sh && \
8283
mkdir -p build && \
8384
cd build && \
84-
../configure --enable-maintainer-mode LDFLAGS="-L`pwd`/../../re2/obj" CPPFLAGS="-I`pwd`/../../re2" && \
85+
../configure LDFLAGS="-L`pwd`/../../re2/obj" CPPFLAGS="-I`pwd`/../../re2" && \
86+
chmod +x ../meta/autotools/install-sh && \
8587
make
8688

8789
re2: $(EXTERNALS)/re2/obj/libre2.a
@@ -93,7 +95,6 @@ re2_cre2: re2 cre2
9395
run:
9496
./pixie-vm
9597

96-
9798
run_interactive:
9899
@PYTHONPATH=$(PYTHONPATH) $(PYTHON) target.py
99100

0 commit comments

Comments
 (0)