diff options
Diffstat (limited to 'src/hdf5.mk')
| -rw-r--r-- | src/hdf5.mk | 42 |
1 files changed, 23 insertions, 19 deletions
diff --git a/src/hdf5.mk b/src/hdf5.mk index 0af0b78..393f190 100644 --- a/src/hdf5.mk +++ b/src/hdf5.mk @@ -3,8 +3,8 @@ PKG := hdf5 $(PKG)_IGNORE := -$(PKG)_VERSION := 1.8.11 -$(PKG)_CHECKSUM := 87ded0894b104cf23a4b965f4ac0a567f8612e5e +$(PKG)_VERSION := 1.8.12 +$(PKG)_CHECKSUM := 8414ca0e6ff7d08e423955960d641ec5f309a55f $(PKG)_SUBDIR := hdf5-$($(PKG)_VERSION) $(PKG)_FILE := hdf5-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://www.hdfgroup.org/ftp/HDF5/releases/$($(PKG)_SUBDIR)/src/$($(PKG)_FILE) @@ -20,15 +20,21 @@ endef define $(PKG)_BUILD # automake 1.13 needs this directory to exist [ -d '$(1)/m4' ] || mkdir '$(1)/m4' - cd '$(1)' && autoreconf --force --install && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ - --disable-shared \ + cd '$(1)' && autoreconf --force --install + cd '$(1)' && ./configure \ + $(MXE_CONFIGURE_OPTS) \ --enable-cxx \ --disable-direct-vfd \ - --prefix='$(PREFIX)/$(TARGET)' \ - CPPFLAGS="-DH5_HAVE_WIN32_API -DH5_HAVE_MINGW -DH5_BUILT_AS_STATIC_LIB" \ - AR='$(TARGET)-ar' + --with-pthread='$(PREFIX)' \ + --with-zlib='$(PREFIX)' \ + AR='$(TARGET)-ar' \ + CPPFLAGS='-DH5_HAVE_WIN32_API \ + -DH5_HAVE_MINGW \ + -DHAVE_WINDOWS_PATH \ + -DH5_BUILT_AS_$(if $(BUILD_STATIC),STATIC,DYNAMIC)_LIB' + + # libtool is somehow created to effectively disallow shared builds + $(SED) -i 's,allow_undefined_flag="unsupported",allow_undefined_flag="",g' '$(1)/libtool' # These programs need to be executed on host to create # H5lib_settings.c and H5Tinit.c @@ -40,16 +46,14 @@ define $(PKG)_BUILD echo 'H5detect.exe > $(TARGET)\H5Tinit.c'; \ echo 'H5make_libsettings.exe > $(TARGET)\H5lib_settings.c';) \ > '$(PREFIX)/$(TARGET)/bin/hdf5-create-settings.bat' - cp '$(1)/mxe-generated-sources/$(TARGET)/'*.c '$(1)/src/' - - $(MAKE) -C '$(1)'/src -j '$(JOBS)' - $(MAKE) -C '$(1)'/src -j 1 install - $(MAKE) -C '$(1)'/c++/src -j '$(JOBS)' - $(MAKE) -C '$(1)'/c++/src -j 1 install - $(MAKE) -C '$(1)'/hl/src -j '$(JOBS)' - $(MAKE) -C '$(1)'/hl/src -j 1 install - $(MAKE) -C '$(1)'/hl/c++/src -j '$(JOBS)' - $(MAKE) -C '$(1)'/hl/c++/src -j 1 install + # generated sources are mostly tied to CPU + # and don't vary with static/shared + cp '$(1)/mxe-generated-sources/$(word 1,$(subst ., ,$(TARGET)))/'*.c '$(1)/src/' + + for d in src c++/src hl/src hl/c++/src; do \ + $(MAKE) -C '$(1)'/$$d -j '$(JOBS)' && \ + $(MAKE) -C '$(1)'/$$d -j 1 install; \ + done # install prefixed wrapper scripts $(INSTALL) -m755 '$(1)'/tools/misc/h5cc '$(PREFIX)/bin/$(TARGET)-h5cc' |