>From bd0535a0fbdfdb89d72c8f54b1d29f855afb4f18 Mon Sep 17 00:00:00 2001 From: Martin Lambers Date: Thu, 6 Dec 2012 13:21:24 +0100 Subject: [PATCH 1/5] Remove unnecessary dependency on msvcr80.dll from hdf5 package. This also removes linking with libmsvcr80.a for the netcdf and gdal packages. --- src/gdal.mk | 2 +- src/hdf5.mk | 3 +-- src/netcdf.mk | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/gdal.mk b/src/gdal.mk index 871cd81..ee8375e 100644 --- a/src/gdal.mk +++ b/src/gdal.mk @@ -73,7 +73,7 @@ define $(PKG)_BUILD --without-php \ --without-ruby \ --without-python \ - LIBS="-ljpeg -lsecur32 -lportablexdr -lmsvcr80 `'$(TARGET)-pkg-config' --libs openssl libtiff-4`" + LIBS="-ljpeg -lsecur32 -lportablexdr `'$(TARGET)-pkg-config' --libs openssl libtiff-4`" $(MAKE) -C '$(1)' -j 1 lib-target $(MAKE) -C '$(1)' -j 1 install-lib $(MAKE) -C '$(1)/port' -j 1 install diff --git a/src/hdf5.mk b/src/hdf5.mk index e2459cc..417f2a9 100644 --- a/src/hdf5.mk +++ b/src/hdf5.mk @@ -22,8 +22,7 @@ define $(PKG)_BUILD --enable-cxx \ --disable-direct-vfd \ --prefix='$(PREFIX)/$(TARGET)' \ - CPPFLAGS="-DH5_HAVE_WIN32_API -D__MSVCRT_VERSION__=0x0800" \ - LIBS="-lmsvcr80" \ + CPPFLAGS="-DH5_HAVE_WIN32_API -DH5_HAVE_MINGW" \ AR='$(TARGET)-ar' $(MAKE) -C '$(1)'/src -j '$(JOBS)' $(MAKE) -C '$(1)'/src -j 1 install diff --git a/src/netcdf.mk b/src/netcdf.mk index a4dde65..d9587d6 100644 --- a/src/netcdf.mk +++ b/src/netcdf.mk @@ -28,8 +28,8 @@ define $(PKG)_BUILD --enable-netcdf-4 \ --enable-hdf4 \ --prefix='$(PREFIX)/$(TARGET)' \ - CPPFLAGS="-D__MSVCRT_VERSION__=0x0800 -D_DLGS_H" \ - LIBS="-lmfhdf -ldf -lmsvcr80 -lportablexdr -lws2_32" + CPPFLAGS="-D_DLGS_H" \ + LIBS="-lmfhdf -ldf -lportablexdr -lws2_32" $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install endef -- 1.7.10.4