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

update: curl, libgpg_error

This commit is contained in:
Mark Brand 2018-12-15 16:06:04 +01:00
parent ed88c4cd8d
commit 5d7c06e3dd
3 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/curl.mk
View File

@ -4,8 +4,8 @@ PKG := curl
$(PKG)_WEBSITE := https://curl.haxx.se/libcurl/
$(PKG)_DESCR := cURL
$(PKG)_IGNORE :=
$(PKG)_VERSION := 7.62.0
$(PKG)_CHECKSUM := dab5643a5fe775ae92570b9f3df6b0ef4bc2a827a959361fb130c73b721275c1
$(PKG)_VERSION := 7.63.0
$(PKG)_CHECKSUM := 9600234c794bfb8a0d3f138e9294d60a20e7a5f10e35ece8cf518e2112d968c4
$(PKG)_SUBDIR := curl-$($(PKG)_VERSION)
$(PKG)_FILE := curl-$($(PKG)_VERSION).tar.xz
$(PKG)_URL := https://curl.haxx.se/download/$($(PKG)_FILE)

21
src/libgpg_error-1-fixes.patch Normal file
View File

@ -0,0 +1,21 @@
This file is part of MXE. See LICENSE.md for licensing information.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Sat, 15 Dec 2018 16:51:30 +0100
Subject: [PATCH 1/1] [MXE] more tolerant parsing for mingw in host triplet
diff --git a/src/mkheader.c b/src/mkheader.c
index 1111111..2222222 100644
--- a/src/mkheader.c
+++ b/src/mkheader.c
@@ -601,7 +601,7 @@ write_special (const char *fname, int lnr, const char *tag)
}
else if (!strcmp (tag, "include:os-add"))
{
- if (!strcmp (host_os, "mingw32"))
+ if (strstr (host_os, "mingw"))
{
include_file (fname, lnr, "w32-add.h", write_line);
}

6
src/libgpg_error.mk
View File

@ -4,8 +4,8 @@ PKG := libgpg_error
$(PKG)_WEBSITE := https://www.gnupg.org/related_software/libgpg-error/
$(PKG)_DESCR := libgpg-error
$(PKG)_IGNORE :=
$(PKG)_VERSION := 1.32
$(PKG)_CHECKSUM := c345c5e73cc2332f8d50db84a2280abfb1d8f6d4f1858b9daa30404db44540ca
$(PKG)_VERSION := 1.33
$(PKG)_CHECKSUM := 5d38826656e746c936e7742d9cde072b50baa3c4c49daa168a56813612bf03ff
$(PKG)_SUBDIR := libgpg-error-$($(PKG)_VERSION)
$(PKG)_FILE := libgpg-error-$($(PKG)_VERSION).tar.bz2
$(PKG)_URL := https://gnupg.org/ftp/gcrypt/libgpg-error/$($(PKG)_FILE)
@ -25,9 +25,9 @@ define $(PKG)_BUILD
$(MXE_CONFIGURE_OPTS) \
--disable-nls \
--disable-languages
$(SED) -i 's/-lgpg-error/-lgpg-error -lintl -liconv -lws2_32/;' '$(1)/src/gpg-error-config'
$(SED) -i 's/host_os = mingw32.*/host_os = mingw32/' '$(1)/src/Makefile'
$(MAKE) -C '$(1)/src' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
$(SED) -i 's/-lgpg-error/-lgpg-error -lintl -liconv -lws2_32/;' '$(1)/src/gpg-error-config'
$(MAKE) -C '$(1)/src' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
ln -sf '$(PREFIX)/$(TARGET)/bin/gpg-error-config' '$(PREFIX)/bin/$(TARGET)-gpg-error-config'
endef