diff options
| author | Tony Theodore <tonyt@logyst.com> | 2017-02-04 07:47:19 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2017-02-04 07:47:19 (GMT) |
| commit | 9bb609a73e349c876638a59e00276b57d7689782 (patch) | |
| tree | d8a44dacc7f9ec31055d3e46221fb18f160f78b5 | |
| parent | 5a629857dfb4d55998627767669f087afc639568 (diff) | |
| parent | 48e792b9e7a681c72bf54a4385638af79cf5b2d6 (diff) | |
| download | mxe-9bb609a73e349c876638a59e00276b57d7689782.zip mxe-9bb609a73e349c876638a59e00276b57d7689782.tar.gz mxe-9bb609a73e349c876638a59e00276b57d7689782.tar.bz2 | |
Merge branch 'LuaAndC-levmar-ua' of https://github.com/tonytheodore/mxe into ua
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | src/levmar.mk | 1 |
2 files changed, 5 insertions, 4 deletions
@@ -34,9 +34,9 @@ LIBTOOLIZE := $(shell glibtoolize --help >/dev/null 2>&1 && echo g)libtoolize PATCH := $(shell gpatch --help >/dev/null 2>&1 && echo g)patch SED := $(shell gsed --help >/dev/null 2>&1 && echo g)sed SORT := $(shell gsort --help >/dev/null 2>&1 && echo g)sort -WGET := wget --no-check-certificate \ - --user-agent=$(shell wget --version | \ - $(SED) -n 's,GNU \(Wget\) \([0-9.]*\).*,\1/\2,p') +DEFAULT_UA := $(shell wget --version | $(SED) -n 's,GNU \(Wget\) \([0-9.]*\).*,\1/\2,p') +WGET = wget --no-check-certificate \ + --user-agent='$(or $($(1)_UA),$(DEFAULT_UA))' REQUIREMENTS := autoconf automake autopoint bash bison bzip2 flex \ $(BUILD_CC) $(BUILD_CXX) gperf intltoolize $(LIBTOOL) \ @@ -464,7 +464,7 @@ download-only-$($(1)_FILE):: @[ -d '$(LOG_DIR)/$(TIMESTAMP)' ] || mkdir -p '$(LOG_DIR)/$(TIMESTAMP)' @if ! $(call CHECK_PKG_ARCHIVE,$(1)); then \ $(PRINTF_FMT) '[download]' '$(1)' | $(RTRIM); \ - ($(call DOWNLOAD_PKG_ARCHIVE,$(1))) &> '$(LOG_DIR)/$(TIMESTAMP)/$(1)-download'; \ + (set -x; $(call DOWNLOAD_PKG_ARCHIVE,$(1))) &> '$(LOG_DIR)/$(TIMESTAMP)/$(1)-download'; \ grep 'MXE Warning' '$(LOG_DIR)/$(TIMESTAMP)/$(1)-download'; \ ln -sf '$(TIMESTAMP)/$(1)-download' '$(LOG_DIR)/$(1)-download'; \ if ! $(call CHECK_PKG_ARCHIVE,$(1)); then \ diff --git a/src/levmar.mk b/src/levmar.mk index f51ec7e..6a22b0d 100644 --- a/src/levmar.mk +++ b/src/levmar.mk @@ -8,6 +8,7 @@ $(PKG)_CHECKSUM := 3bf4ef1ea4475ded5315e8d8fc992a725f2e7940a74ca3b0f9029d9e6e94b $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tgz $(PKG)_URL := http://www.ics.forth.gr/~lourakis/$(PKG)/$($(PKG)_FILE) +$(PKG)_UA := MXE $(PKG)_DEPS := gcc blas lapack libf2c define $(PKG)_UPDATE |