update libgpg_error

This commit is contained in:
Mark Brand 2018-04-04 21:15:07 +02:00
parent cd483111ea
commit f0dd16d059
2 changed files with 31 additions and 4 deletions

View File

@ -0,0 +1,27 @@
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: Mark Brand <mabrand@mabrand.nl>
Date: Wed, 4 Apr 2018 23:15:55 +0200
Subject: [PATCH 1/1] quick build hack for MXE
diff --git a/src/w32-add.h b/src/w32-add.h
index 1111111..2222222 100644
--- a/src/w32-add.h
+++ b/src/w32-add.h
@@ -3,9 +3,11 @@
## peculiarity of the script the first used line must not
## start with a hash mark.
+#include <sys/types.h>
+
/* Fixme: This is a quick hack. We need to check whether the compiler
* actually in use already knows that type. */
-typedef int pid_t;
+//typedef int pid_t;
/* Decide whether to use the format_arg attribute. */
#if _GPG_ERR_GCC_VERSION > 20800

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.27
$(PKG)_CHECKSUM := 4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a22d29d2
$(PKG)_VERSION := 1.28
$(PKG)_CHECKSUM := 3edb957744905412f30de3e25da18682cbe509541e18cd3b8f9df695a075da49
$(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)
@ -15,7 +15,7 @@ $(PKG)_DEPS := cc gettext
define $(PKG)_UPDATE
$(WGET) -q -O- 'https://gnupg.org/ftp/gcrypt/libgpg-error/' | \
$(SED) -n 's,.*libgpg-error-\([1-9]\.[1-9][0-9][^>]*\)\.tar.*,\1,p' | \
tail -1
head -1
endef
define $(PKG)_BUILD
@ -25,7 +25,7 @@ define $(PKG)_BUILD
$(MXE_CONFIGURE_OPTS) \
--disable-nls \
--disable-languages
$(SED) -i 's/-lgpg-error/-lgpg-error -lintl -liconv/;' '$(1)/src/gpg-error-config'
$(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=
$(MAKE) -C '$(1)/src' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=