From 9bbafa5f29b18641148938b12b782f0026d18b48 Mon Sep 17 00:00:00 2001 From: Dipterix Wang <8163576+dipterix@users.noreply.github.com> Date: Sun, 22 Sep 2024 23:20:40 -0400 Subject: [PATCH 1/7] Create rules.mk --- libs/recipes/hdf5/rules.mk | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 libs/recipes/hdf5/rules.mk diff --git a/libs/recipes/hdf5/rules.mk b/libs/recipes/hdf5/rules.mk new file mode 100644 index 00000000..ec40e0d0 --- /dev/null +++ b/libs/recipes/hdf5/rules.mk @@ -0,0 +1,29 @@ +HDF5_VERSION = 1.12.3 +HDF5_VERSION_UNDERSCORE = 1_12_3 +HDF5_TARBALL = $(DOWNLOAD)/hdf5-$(HDF5_VERSION_UNDERSCORE).tar.gz +HDF5_URL = https://github.com/HDFGroup/hdf5/releases/download/hdf5-$(HDF5_VERSION_UNDERSCORE)/hdf5-$(HDF5_VERSION_UNDERSCORE).tar.gz + + +.PHONY: hdf5 +hdf5: $(HDF5_WASM_LIB) + +$(HDF5_TARBALL): + mkdir -p $(DOWNLOAD) + wget $(HDF5_URL) -O $@ + +# How to include --with-szlib=zlib? + +$(HDF5_WASM_LIB): $(HDF5_TARBALL) + mkdir -p $(BUILD)/hdf5-$(HDF5_VERSION)/build + tar -C $(BUILD) -xf $(HDF5_TARBALL) + cd $(BUILD)/hdf5-$(HDF5_VERSION)/build && \ + emconfigure ../configure \ + --enable-build-mode=production \ + --disable-dependency-tracking \ + --disable-silent-rules \ + --enable-shared=no \ + --enable-static=yes \ + --enable-cxx \ + --prefix=$(WASM) && \ + emmake make install + From 67c262f540866a561a9c3294eb37ff9414abcdaf Mon Sep 17 00:00:00 2001 From: Dipterix Wang <8163576+dipterix@users.noreply.github.com> Date: Sun, 22 Sep 2024 23:23:54 -0400 Subject: [PATCH 2/7] Create targets.mk --- libs/recipes/hdf5/targets.mk | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 libs/recipes/hdf5/targets.mk diff --git a/libs/recipes/hdf5/targets.mk b/libs/recipes/hdf5/targets.mk new file mode 100644 index 00000000..613b1966 --- /dev/null +++ b/libs/recipes/hdf5/targets.mk @@ -0,0 +1,3 @@ +HDF5_WASM_LIB = $(WASM)/lib/libhdf5.a +OPTIONAL_HDF5_LIBS += $(HDF5_WASM_LIB) +OPTIONAL_HDF5_BINS += h5cc From b69fcfe3825e4f216d3ad7a100734da1b9d6ccb8 Mon Sep 17 00:00:00 2001 From: Dipterix Wang <8163576+dipterix@users.noreply.github.com> Date: Sun, 22 Sep 2024 23:25:11 -0400 Subject: [PATCH 3/7] Update rules.mk --- libs/recipes/hdf5/rules.mk | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/libs/recipes/hdf5/rules.mk b/libs/recipes/hdf5/rules.mk index ec40e0d0..d8b86268 100644 --- a/libs/recipes/hdf5/rules.mk +++ b/libs/recipes/hdf5/rules.mk @@ -14,16 +14,15 @@ $(HDF5_TARBALL): # How to include --with-szlib=zlib? $(HDF5_WASM_LIB): $(HDF5_TARBALL) - mkdir -p $(BUILD)/hdf5-$(HDF5_VERSION)/build - tar -C $(BUILD) -xf $(HDF5_TARBALL) - cd $(BUILD)/hdf5-$(HDF5_VERSION)/build && \ - emconfigure ../configure \ - --enable-build-mode=production \ - --disable-dependency-tracking \ - --disable-silent-rules \ - --enable-shared=no \ - --enable-static=yes \ - --enable-cxx \ - --prefix=$(WASM) && \ - emmake make install + mkdir -p $(BUILD)/hdf5-$(HDF5_VERSION)/build + tar -C $(BUILD) -xf $(HDF5_TARBALL) + cd $(BUILD)/hdf5-$(HDF5_VERSION)/build && \ + emconfigure ../configure \ + --enable-build-mode=production \ + --disable-dependency-tracking \ + --disable-silent-rules \ + --enable-shared=no \ + --enable-static=yes \ + --prefix=$(WASM) && \ + emmake make install From 114da292adb095c76c5ae2000ade91a709f6c7f6 Mon Sep 17 00:00:00 2001 From: Dipterix Wang <8163576+dipterix@users.noreply.github.com> Date: Sun, 22 Sep 2024 23:28:19 -0400 Subject: [PATCH 4/7] Fixing indent --- libs/recipes/hdf5/rules.mk | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/libs/recipes/hdf5/rules.mk b/libs/recipes/hdf5/rules.mk index d8b86268..37fdf3f7 100644 --- a/libs/recipes/hdf5/rules.mk +++ b/libs/recipes/hdf5/rules.mk @@ -14,15 +14,15 @@ $(HDF5_TARBALL): # How to include --with-szlib=zlib? $(HDF5_WASM_LIB): $(HDF5_TARBALL) - mkdir -p $(BUILD)/hdf5-$(HDF5_VERSION)/build - tar -C $(BUILD) -xf $(HDF5_TARBALL) - cd $(BUILD)/hdf5-$(HDF5_VERSION)/build && \ - emconfigure ../configure \ - --enable-build-mode=production \ - --disable-dependency-tracking \ - --disable-silent-rules \ - --enable-shared=no \ - --enable-static=yes \ - --prefix=$(WASM) && \ - emmake make install + mkdir -p $(BUILD)/hdf5-$(HDF5_VERSION)/build + tar -C $(BUILD) -xf $(HDF5_TARBALL) + cd $(BUILD)/hdf5-$(HDF5_VERSION)/build && \ + emconfigure ../configure \ + --enable-build-mode=production \ + --disable-dependency-tracking \ + --disable-silent-rules \ + --enable-shared=no \ + --enable-static=yes \ + --prefix=$(WASM) && \ + emmake make install From 8de13245fa97a368b918b143a234a1beed6293bc Mon Sep 17 00:00:00 2001 From: Dipterix Wang <8163576+dipterix@users.noreply.github.com> Date: Tue, 1 Oct 2024 06:21:17 -0400 Subject: [PATCH 5/7] Update libs/recipes/hdf5/rules.mk Co-authored-by: George Stagg --- libs/recipes/hdf5/rules.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/recipes/hdf5/rules.mk b/libs/recipes/hdf5/rules.mk index 37fdf3f7..535f5c50 100644 --- a/libs/recipes/hdf5/rules.mk +++ b/libs/recipes/hdf5/rules.mk @@ -14,9 +14,9 @@ $(HDF5_TARBALL): # How to include --with-szlib=zlib? $(HDF5_WASM_LIB): $(HDF5_TARBALL) - mkdir -p $(BUILD)/hdf5-$(HDF5_VERSION)/build - tar -C $(BUILD) -xf $(HDF5_TARBALL) - cd $(BUILD)/hdf5-$(HDF5_VERSION)/build && \ + mkdir -p $(BUILD)/hdf5-$(HDF5_VERSION)/hdfsrc/build + tar -C $(BUILD)/hdf5-$(HDF5_VERSION) -xf $(HDF5_TARBALL) + cd $(BUILD)/hdf5-$(HDF5_VERSION)/hdfsrc/build && \ emconfigure ../configure \ --enable-build-mode=production \ --disable-dependency-tracking \ From a31fe64474ff3ca29d60af72a42020ef9f7cd84c Mon Sep 17 00:00:00 2001 From: Dipterix Wang <8163576+dipterix@users.noreply.github.com> Date: Tue, 1 Oct 2024 06:21:28 -0400 Subject: [PATCH 6/7] Update libs/recipes/hdf5/rules.mk Co-authored-by: George Stagg --- libs/recipes/hdf5/rules.mk | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libs/recipes/hdf5/rules.mk b/libs/recipes/hdf5/rules.mk index 535f5c50..48ba0454 100644 --- a/libs/recipes/hdf5/rules.mk +++ b/libs/recipes/hdf5/rules.mk @@ -18,11 +18,11 @@ $(HDF5_WASM_LIB): $(HDF5_TARBALL) tar -C $(BUILD)/hdf5-$(HDF5_VERSION) -xf $(HDF5_TARBALL) cd $(BUILD)/hdf5-$(HDF5_VERSION)/hdfsrc/build && \ emconfigure ../configure \ - --enable-build-mode=production \ - --disable-dependency-tracking \ - --disable-silent-rules \ - --enable-shared=no \ - --enable-static=yes \ - --prefix=$(WASM) && \ + --enable-build-mode=production \ + --disable-dependency-tracking \ + --disable-silent-rules \ + --enable-shared=no \ + --enable-static=yes \ + --prefix=$(WASM) && \ emmake make install From 6c516b0221ea13541be939473f897a66cb8b96fd Mon Sep 17 00:00:00 2001 From: Dipterix Wang <8163576+dipterix@users.noreply.github.com> Date: Tue, 1 Oct 2024 06:21:36 -0400 Subject: [PATCH 7/7] Update libs/recipes/hdf5/targets.mk Co-authored-by: George Stagg --- libs/recipes/hdf5/targets.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/recipes/hdf5/targets.mk b/libs/recipes/hdf5/targets.mk index 613b1966..2f450db8 100644 --- a/libs/recipes/hdf5/targets.mk +++ b/libs/recipes/hdf5/targets.mk @@ -1,3 +1,3 @@ HDF5_WASM_LIB = $(WASM)/lib/libhdf5.a -OPTIONAL_HDF5_LIBS += $(HDF5_WASM_LIB) -OPTIONAL_HDF5_BINS += h5cc +OPTIONAL_WASM_LIBS += $(HDF5_WASM_LIB) +OPTIONAL_WASM_BINS += h5cc