diff options
| author | Tony Theodore <tonyt@logyst.com> | 2019-06-28 08:49:33 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2019-06-28 08:49:33 (GMT) |
| commit | 2798e5004f0d2a7b918143fb224b69777deef214 (patch) | |
| tree | 7cdba3ce817dd3b2ec2ed1d0f71c8799dd24d6b3 | |
| parent | 8d7a1ce6637b1fb20121d2072c7a0a03a869cca0 (diff) | |
| download | mxe-2798e5004f0d2a7b918143fb224b69777deef214.zip mxe-2798e5004f0d2a7b918143fb224b69777deef214.tar.gz mxe-2798e5004f0d2a7b918143fb224b69777deef214.tar.bz2 | |
m4: update 1.4.17 --> 1.4.18
| l--------- | plugins/native/darwin/m4-1-fixes.patch | 1 | ||||
| -rw-r--r-- | plugins/native/m4-1-fixes.patch | 25 | ||||
| -rw-r--r-- | plugins/native/m4.mk | 13 |
3 files changed, 32 insertions, 7 deletions
diff --git a/plugins/native/darwin/m4-1-fixes.patch b/plugins/native/darwin/m4-1-fixes.patch new file mode 120000 index 0000000..8d52bee --- /dev/null +++ b/plugins/native/darwin/m4-1-fixes.patch @@ -0,0 +1 @@ +../m4-1-fixes.patch
\ No newline at end of file diff --git a/plugins/native/m4-1-fixes.patch b/plugins/native/m4-1-fixes.patch new file mode 100644 index 0000000..367d08e --- /dev/null +++ b/plugins/native/m4-1-fixes.patch @@ -0,0 +1,25 @@ +This file is part of MXE. See LICENSE.md for licensing information. + +Contains ad hoc patches for cross building. + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Tony Theodore <tonyt@logyst.com> +Date: Fri, 28 Jun 2019 18:34:23 +1000 +Subject: [PATCH 1/1] fix darwin build + +see: +https://github.com/macports/macports-ports/commit/edf0ee1e2cfa884c73089e7ca32e7009f071dbd0 + +diff --git a/lib/vasnprintf.c b/lib/vasnprintf.c +index 1111111..2222222 100644 +--- a/lib/vasnprintf.c ++++ b/lib/vasnprintf.c +@@ -4858,7 +4858,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, + #endif + *fbp = dp->conversion; + #if USE_SNPRINTF +-# if !(((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) && !defined __UCLIBC__) || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)) ++# if !defined(__APPLE__) && !(((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) && !defined __UCLIBC__) || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)) + fbp[1] = '%'; + fbp[2] = 'n'; + fbp[3] = '\0'; diff --git a/plugins/native/m4.mk b/plugins/native/m4.mk index 99d6fc4..47ed68c 100644 --- a/plugins/native/m4.mk +++ b/plugins/native/m4.mk @@ -2,8 +2,8 @@ PKG := m4 $(PKG)_IGNORE := -$(PKG)_VERSION := 1.4.17 -$(PKG)_CHECKSUM := f0543c3beb51fa6b3337d8025331591e0e18d8ec2886ed391f1aade43477d508 +$(PKG)_VERSION := 1.4.18 +$(PKG)_CHECKSUM := f2c1e86ca0a404ff281631bdc8377638992744b175afb806e25871a24a934e07 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.xz $(PKG)_URL := https://ftp.gnu.org/gnu/m4/$($(PKG)_FILE) @@ -22,10 +22,9 @@ endef define $(PKG)_BUILD_$(BUILD) # gets has been removed from recent glibc - $(SED) -i -e '/gets is a/d' '$(1)/lib/stdio.in.h' - mkdir '$(1).build' - cd '$(1).build' && '$(1)/configure' \ + $(SED) -i -e '/gets is a/d' '$(SOURCE_DIR)/lib/stdio.in.h' + cd '$(BUILD_DIR)' && '$(SOURCE_DIR)/configure' \ --prefix='$(PREFIX)/$(TARGET)' - $(MAKE) -C '$(1).build' -j '$(JOBS)' - $(MAKE) -C '$(1).build' -j 1 install + $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' + $(MAKE) -C '$(BUILD_DIR)' -j 1 install endef |