Merge branch 'master' of https://github.com/JuliaLang/julia

gloine · Sep 3, 2014 · eb65543 · eb65543
2 parents e0016df + ad7f311
commit eb65543
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 48 deletions.
diff --git a/deps/Makefile b/deps/Makefile
@@ -575,10 +575,9 @@ PCRE_OBJ_TARGET = $(build_shlibdir)/libpcre.$(SHLIB_EXT)
 
 pcre-$(PCRE_VER).tar.bz2:
 	$(JLDOWNLOAD) $@ http://sourceforge.net/projects/pcre/files/pcre/$(PCRE_VER)/$@/download
-pcre-$(PCRE_VER)/configure: pcre-$(PCRE_VER).tar.bz2 pcre-gcc49-compile.patch
+pcre-$(PCRE_VER)/configure: pcre-$(PCRE_VER).tar.bz2
 	$(JLCHECKSUM) $<
 	$(TAR) jxf $<
-	cd pcre-$(PCRE_VER) && patch -p1 < ../pcre-gcc49-compile.patch
 	touch -c $@
 pcre-$(PCRE_VER)/config.status: pcre-$(PCRE_VER)/configure
 	cd pcre-$(PCRE_VER) && \

diff --git a/deps/Versions.make b/deps/Versions.make
@@ -1,7 +1,7 @@
 LLVM_VER = 3.3
 LLVM_LIB_SUFFIX =
 LLDB_VER = release_33 
-PCRE_VER = 8.31
+PCRE_VER = 8.35
 DSFMT_VER = 2.2
 OPENBLAS_VER = v0.2.10
 LAPACK_VER = 3.5.0

diff --git a/deps/checksums/pcre-8.31.tar.bz2/md5 b/deps/checksums/pcre-8.31.tar.bz2/md5
diff --git a/deps/checksums/pcre-8.31.tar.bz2/sha512 b/deps/checksums/pcre-8.31.tar.bz2/sha512
diff --git a/deps/checksums/pcre-8.35.tar.bz2/md5 b/deps/checksums/pcre-8.35.tar.bz2/md5
@@ -0,0 +1 @@
+6aacb23986adccd9b3bc626c00979958
diff --git a/deps/checksums/pcre-8.35.tar.bz2/sha512 b/deps/checksums/pcre-8.35.tar.bz2/sha512
@@ -0,0 +1 @@
+e94c652b40de60b391e28afbddc67b5a034650f6f62027e52f2d7aef53caf5f0da9f2d4f6872d1558f965dd9d4d696e5e23d2a50f20a4fbc9f0a707fb6f55fae
diff --git a/deps/pcre-gcc49-compile.patch b/deps/pcre-gcc49-compile.patch
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		e94c652b40de60b391e28afbddc67b5a034650f6f62027e52f2d7aef53caf5f0da9f2d4f6872d1558f965dd9d4d696e5e23d2a50f20a4fbc9f0a707fb6f55fae