From 89189dab9a9605f6cfcf41872faec4a147023620 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Thu, 15 Mar 2018 13:31:21 +1100 Subject: [PATCH] coda: update 2.15.1 --> 2.18.3 --- src/coda-1-use-stdint.patch | 21 --------------------- src/coda.mk | 24 ++++++------------------ 2 files changed, 6 insertions(+), 39 deletions(-) delete mode 100644 src/coda-1-use-stdint.patch diff --git a/src/coda-1-use-stdint.patch b/src/coda-1-use-stdint.patch deleted file mode 100644 index d116b8d3..00000000 --- a/src/coda-1-use-stdint.patch +++ /dev/null @@ -1,21 +0,0 @@ -This file is part of MXE. See LICENSE.md for licensing information. - -This patch has been taken from https://github.com/stcorp/coda/pull/9 - -diff --git a/libcoda/coda.h.in b/libcoda/coda.h.in -index 1587c61..b7dce21 100644 ---- a/libcoda/coda.h.in -+++ b/libcoda/coda.h.in -@@ -33,9 +33,9 @@ extern "C" - #ifdef WIN32 - #include - --#if (_MSC_VER < 1600) --/* For Visual Studio we can use stdint.h as of Visual Studio 2010 -- * For earlier versions we need to provide our own defines -+#if (_MSC_VER < 1600) && !defined(__MINGW32__) -+/* For Visual Studio > 2010 and MinGW we can use stdint.h -+ * For earlier versions of Visual Studio we need to provide our own defines - */ - #ifndef int8_t - #define int8_t signed char diff --git a/src/coda.mk b/src/coda.mk index fd2a4854..a7bf75f1 100644 --- a/src/coda.mk +++ b/src/coda.mk @@ -4,33 +4,21 @@ PKG := coda $(PKG)_WEBSITE := https://stcorp.nl/coda/ $(PKG)_DESCR := CODA $(PKG)_IGNORE := -$(PKG)_VERSION := 2.15.1 -$(PKG)_CHECKSUM := 51076ff958ec15633d741ea021761fc6d8c6492f931175c489288481e37ac810 -$(PKG)_SUBDIR := coda-$($(PKG)_VERSION) -$(PKG)_FILE := coda-$($(PKG)_VERSION).tar.gz -$(PKG)_URL := https://github.com/stcorp/coda/releases/download/$($(PKG)_VERSION)/$($(PKG)_FILE) +$(PKG)_VERSION := 2.18.3 +$(PKG)_CHECKSUM := e0f72ed7927431748907b57b3fcfa7515ee071162f138e784555d6ca377b9ffe +$(PKG)_GH_CONF := stcorp/coda/releases/latest $(PKG)_DEPS := cc -define $(PKG)_UPDATE - echo 'TODO: write update script for $(PKG).' >&2; - echo $($(PKG)_VERSION) -endef - define $(PKG)_BUILD - cd '$(1)' && ./configure \ + cd '$(BUILD_DIR)' && $(SOURCE_DIR)/configure \ $(MXE_CONFIGURE_OPTS) \ --disable-idl \ --disable-matlab \ --disable-python \ --without-hdf5 \ --without-hdf4 - - # Fortran includes are generated by the tool 'generate-finc', - # which needs to run natively: - cd '$(1)' && $(CC) -I . -o generate-finc fortran/generate-finc.c - - $(MAKE) -C '$(1)' -j '$(JOBS)' - $(MAKE) -C '$(1)' -j 1 install-libLTLIBRARIES install-nodist_includeHEADERS install-fortranDATA + $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' + $(MAKE) -C '$(BUILD_DIR)' -j 1 install-libLTLIBRARIES install-nodist_includeHEADERS install-fortranDATA '$(TARGET)-gcc' \ -std=c99 -W -Wall -Werror -pedantic \