d0s3t3ch
/
mxe
mirror of https://git.wownero.com/dsc/mxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

m4: update 1.4.17 --> 1.4.18

This commit is contained in:
Tony Theodore 2019-06-28 18:49:33 +10:00
parent 8d7a1ce663
commit 2798e5004f
3 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/native/darwin/m4-1-fixes.patch Symbolic link
View File

@ -0,0 +1 @@
../m4-1-fixes.patch

25
plugins/native/m4-1-fixes.patch Normal file
View File

@ -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';

13
plugins/native/m4.mk
View File

@ -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