Update non-BB dsfmt build to match with the BB one. (#38917)

* Update non-BB dsfmt build to match with the BB one. Update URLs to https Fix #17945 * Add -DDSFMT_SHLIB
JuliaLang · Dec 17, 2020 · b36338a · b36338a
1 parent 9ec3147
commit b36338a
Show file tree

Hide file tree

Showing 11 changed files with 9 additions and 473 deletions.
diff --git a/deps/Versions.make b/deps/Versions.make
@@ -18,7 +18,7 @@ CLANG_JLL_NAME := Clang
 CLANG_JLL_VER  := 11.0.0+4
 
 # DSFMT
-DSFMT_VER := 2.2.3
+DSFMT_VER := 2.2.4
 DSFMT_JLL_NAME := dSFMT
 
 # GMP

diff --git a/deps/blas.mk b/deps/blas.mk
@@ -154,7 +154,7 @@ LAPACK_MFLAGS := NOOPT="$(FFLAGS) $(JFFLAGS) $(USE_BLAS_FFLAGS) -O0" \
     LOADER="$(FC)" BLASLIB="$(RPATH_ESCAPED_ORIGIN) $(LIBBLAS)"
 
 $(SRCCACHE)/lapack-$(LAPACK_VER).tgz: | $(SRCCACHE)
-	$(JLDOWNLOAD) $@ http://www.netlib.org/lapack/$(notdir $@)
+	$(JLDOWNLOAD) $@ https://www.netlib.org/lapack/$(notdir $@)
 
 $(BUILDDIR)/lapack-$(LAPACK_VER)/source-extracted: $(SRCCACHE)/lapack-$(LAPACK_VER).tgz
 	$(JLCHECKSUM) $<

diff --git a/deps/checksums/dsfmt-2.2.3.tar.gz/md5 b/deps/checksums/dsfmt-2.2.3.tar.gz/md5
diff --git a/deps/checksums/dsfmt-2.2.3.tar.gz/sha512 b/deps/checksums/dsfmt-2.2.3.tar.gz/sha512
diff --git a/deps/checksums/dsfmt-2.2.4.tar.gz/md5 b/deps/checksums/dsfmt-2.2.4.tar.gz/md5
@@ -0,0 +1 @@
+ed30e63552d62df48d709dde4f755660
diff --git a/deps/checksums/dsfmt-2.2.4.tar.gz/sha512 b/deps/checksums/dsfmt-2.2.4.tar.gz/sha512
@@ -0,0 +1 @@
+fe84e986cbf198172340adfac0436b08f087643eca3f1ceccacde146cbfd8c41e3eb0dfbb062f7ca5f462db13c386abd7c269bc0cbefc9a0ecf97a8a8870a2e4
diff --git a/deps/dsfmt.mk b/deps/dsfmt.mk
@@ -2,10 +2,10 @@
 
 ifneq ($(USE_BINARYBUILDER_DSFMT),1)
 
-DSFMT_CFLAGS := $(CFLAGS) -DNDEBUG -DDSFMT_MEXP=19937 $(fPIC) -DDSFMT_DO_NOT_USE_OLD_NAMES
+DSFMT_CFLAGS := $(CFLAGS) -DNDEBUG -DDSFMT_MEXP=19937 $(fPIC) -DDSFMT_DO_NOT_USE_OLD_NAMES -DDSFMT_SHLIB
 ifneq ($(USEMSVC), 1)
 DSFMT_CFLAGS += -O3 -finline-functions -fomit-frame-pointer -fno-strict-aliasing \
-		--param max-inline-insns-single=1800 -Wmissing-prototypes -Wall  -std=c99 -shared
+		--param max-inline-insns-single=1800 -Wall  -std=c99 -shared
 else
 DSFMT_CFLAGS += -Wl,-dll,-def:../../libdSFMT.def
 endif
@@ -14,16 +14,14 @@ DSFMT_CFLAGS += -msse2 -DHAVE_SSE2
 endif
 
 $(SRCCACHE)/dsfmt-$(DSFMT_VER).tar.gz: | $(SRCCACHE)
-	$(JLDOWNLOAD) $@ http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-$(DSFMT_VER).tar.gz
+	$(JLDOWNLOAD) $@ https://github.com/MersenneTwister-Lab/dSFMT/archive/v$(DSFMT_VER).tar.gz
 	touch -c $@
 
 $(BUILDDIR)/dsfmt-$(DSFMT_VER)/source-extracted: $(SRCCACHE)/dsfmt-$(DSFMT_VER).tar.gz
 	$(JLCHECKSUM) $<
 	-rm -r $(dir $@)
 	mkdir -p $(dir $@)
 	$(TAR) -C $(dir $@) --strip-components 1 -xf $<
-	cd $(dir $@) && patch < $(SRCDIR)/patches/dSFMT.h.patch
-	cd $(dir $@) && patch < $(SRCDIR)/patches/dSFMT.c.patch
 	echo 1 > $@
 
 checksum-dsfmt: $(SRCCACHE)/dsfmt-$(DSFMT_VER).tar.gz

diff --git a/deps/mpfr.mk b/deps/mpfr.mk
@@ -27,7 +27,7 @@ MPFR_OPTS += --host=none-unknown-linux
 endif
 
 $(SRCCACHE)/mpfr-$(MPFR_VER).tar.bz2: | $(SRCCACHE)
-	$(JLDOWNLOAD) $@ http://www.mpfr.org/mpfr-$(MPFR_VER)/$(notdir $@)
+	$(JLDOWNLOAD) $@ https://www.mpfr.org/mpfr-$(MPFR_VER)/$(notdir $@)
 $(SRCCACHE)/mpfr-$(MPFR_VER)/source-extracted: $(SRCCACHE)/mpfr-$(MPFR_VER).tar.bz2
 	$(JLCHECKSUM) $<
 	cd $(dir $<) && $(TAR) -jxf $<

diff --git a/deps/objconv.mk b/deps/objconv.mk
@@ -3,7 +3,7 @@
 ifneq ($(USE_BINARYBUILDER_OBJCONV),1)
 
 $(SRCCACHE)/objconv.zip: | $(SRCCACHE)
-	$(JLDOWNLOAD) $@ http://www.agner.org/optimize/objconv.zip
+	$(JLDOWNLOAD) $@ https://www.agner.org/optimize/objconv.zip
 
 $(BUILDDIR)/objconv/source-extracted: $(SRCCACHE)/objconv.zip
 	-rm -r $(dir $@)

diff --git a/deps/patches/dSFMT.c.patch b/deps/patches/dSFMT.c.patch
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		fe84e986cbf198172340adfac0436b08f087643eca3f1ceccacde146cbfd8c41e3eb0dfbb062f7ca5f462db13c386abd7c269bc0cbefc9a0ecf97a8a8870a2e4