Skip to content

Commit b36338a

Browse files
authored
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
1 parent 9ec3147 commit b36338a

File tree

11 files changed

+9
-473
lines changed

11 files changed

+9
-473
lines changed

deps/Versions.make

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ CLANG_JLL_NAME := Clang
1818
CLANG_JLL_VER := 11.0.0+4
1919

2020
# DSFMT
21-
DSFMT_VER := 2.2.3
21+
DSFMT_VER := 2.2.4
2222
DSFMT_JLL_NAME := dSFMT
2323

2424
# GMP

deps/blas.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ LAPACK_MFLAGS := NOOPT="$(FFLAGS) $(JFFLAGS) $(USE_BLAS_FFLAGS) -O0" \
154154
LOADER="$(FC)" BLASLIB="$(RPATH_ESCAPED_ORIGIN) $(LIBBLAS)"
155155

156156
$(SRCCACHE)/lapack-$(LAPACK_VER).tgz: | $(SRCCACHE)
157-
$(JLDOWNLOAD) $@ http://www.netlib.org/lapack/$(notdir $@)
157+
$(JLDOWNLOAD) $@ https://www.netlib.org/lapack/$(notdir $@)
158158

159159
$(BUILDDIR)/lapack-$(LAPACK_VER)/source-extracted: $(SRCCACHE)/lapack-$(LAPACK_VER).tgz
160160
$(JLCHECKSUM) $<

deps/checksums/dsfmt-2.2.3.tar.gz/md5

Lines changed: 0 additions & 1 deletion
This file was deleted.

deps/checksums/dsfmt-2.2.3.tar.gz/sha512

Lines changed: 0 additions & 1 deletion
This file was deleted.

deps/checksums/dsfmt-2.2.4.tar.gz/md5

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ed30e63552d62df48d709dde4f755660
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
fe84e986cbf198172340adfac0436b08f087643eca3f1ceccacde146cbfd8c41e3eb0dfbb062f7ca5f462db13c386abd7c269bc0cbefc9a0ecf97a8a8870a2e4

deps/dsfmt.mk

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
ifneq ($(USE_BINARYBUILDER_DSFMT),1)
44

5-
DSFMT_CFLAGS := $(CFLAGS) -DNDEBUG -DDSFMT_MEXP=19937 $(fPIC) -DDSFMT_DO_NOT_USE_OLD_NAMES
5+
DSFMT_CFLAGS := $(CFLAGS) -DNDEBUG -DDSFMT_MEXP=19937 $(fPIC) -DDSFMT_DO_NOT_USE_OLD_NAMES -DDSFMT_SHLIB
66
ifneq ($(USEMSVC), 1)
77
DSFMT_CFLAGS += -O3 -finline-functions -fomit-frame-pointer -fno-strict-aliasing \
8-
--param max-inline-insns-single=1800 -Wmissing-prototypes -Wall -std=c99 -shared
8+
--param max-inline-insns-single=1800 -Wall -std=c99 -shared
99
else
1010
DSFMT_CFLAGS += -Wl,-dll,-def:../../libdSFMT.def
1111
endif
@@ -14,16 +14,14 @@ DSFMT_CFLAGS += -msse2 -DHAVE_SSE2
1414
endif
1515

1616
$(SRCCACHE)/dsfmt-$(DSFMT_VER).tar.gz: | $(SRCCACHE)
17-
$(JLDOWNLOAD) $@ http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-$(DSFMT_VER).tar.gz
17+
$(JLDOWNLOAD) $@ https://github.com/MersenneTwister-Lab/dSFMT/archive/v$(DSFMT_VER).tar.gz
1818
touch -c $@
1919

2020
$(BUILDDIR)/dsfmt-$(DSFMT_VER)/source-extracted: $(SRCCACHE)/dsfmt-$(DSFMT_VER).tar.gz
2121
$(JLCHECKSUM) $<
2222
-rm -r $(dir $@)
2323
mkdir -p $(dir $@)
2424
$(TAR) -C $(dir $@) --strip-components 1 -xf $<
25-
cd $(dir $@) && patch < $(SRCDIR)/patches/dSFMT.h.patch
26-
cd $(dir $@) && patch < $(SRCDIR)/patches/dSFMT.c.patch
2725
echo 1 > $@
2826

2927
checksum-dsfmt: $(SRCCACHE)/dsfmt-$(DSFMT_VER).tar.gz

deps/mpfr.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ MPFR_OPTS += --host=none-unknown-linux
2727
endif
2828

2929
$(SRCCACHE)/mpfr-$(MPFR_VER).tar.bz2: | $(SRCCACHE)
30-
$(JLDOWNLOAD) $@ http://www.mpfr.org/mpfr-$(MPFR_VER)/$(notdir $@)
30+
$(JLDOWNLOAD) $@ https://www.mpfr.org/mpfr-$(MPFR_VER)/$(notdir $@)
3131
$(SRCCACHE)/mpfr-$(MPFR_VER)/source-extracted: $(SRCCACHE)/mpfr-$(MPFR_VER).tar.bz2
3232
$(JLCHECKSUM) $<
3333
cd $(dir $<) && $(TAR) -jxf $<

deps/objconv.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
ifneq ($(USE_BINARYBUILDER_OBJCONV),1)
44

55
$(SRCCACHE)/objconv.zip: | $(SRCCACHE)
6-
$(JLDOWNLOAD) $@ http://www.agner.org/optimize/objconv.zip
6+
$(JLDOWNLOAD) $@ https://www.agner.org/optimize/objconv.zip
77

88
$(BUILDDIR)/objconv/source-extracted: $(SRCCACHE)/objconv.zip
99
-rm -r $(dir $@)

deps/patches/dSFMT.c.patch

Lines changed: 0 additions & 100 deletions
This file was deleted.

0 commit comments

Comments
 (0)