diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2015-05-27 13:49:13 (GMT) |
|---|---|---|
| committer | Mark Brand <mabrand@mabrand.nl> | 2015-06-18 10:02:01 (GMT) |
| commit | 6a00fc305aaf5c35bc68a6648d313b222e42b983 (patch) | |
| tree | 794d154b3d7e711a372993381636d02e4f254555 /src/nettle-1.patch | |
| parent | 281429d7301a8acc0f8f516a3c759774d27d16f1 (diff) | |
| download | mxe-6a00fc305aaf5c35bc68a6648d313b222e42b983.zip mxe-6a00fc305aaf5c35bc68a6648d313b222e42b983.tar.gz mxe-6a00fc305aaf5c35bc68a6648d313b222e42b983.tar.bz2 | |
gnutls nettle: update
libgsasl and nettle no longer conflict over memxor, so the workaround
is removed.
Diffstat (limited to 'src/nettle-1.patch')
| -rw-r--r-- | src/nettle-1.patch | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/src/nettle-1.patch b/src/nettle-1.patch new file mode 100644 index 0000000..25436b2 --- /dev/null +++ b/src/nettle-1.patch @@ -0,0 +1,54 @@ +This file is part of MXE. +See index.html for further information. + +From 29cb19fb27ec834473d638fb13a947e0e004116d Mon Sep 17 00:00:00 2001 +From: Mark Brand <mabrand@mabrand.nl> +Date: Sun, 12 Apr 2015 10:07:58 +0200 +Subject: [PATCH] Revert "Include private dependencies automatically in + pkg-config for non-shared builds" + +This reverts commit c8b1d2fafff16c57ec50d413c999796ec2085413. + +diff --git a/configure.ac b/configure.ac +index 5a16151..e6cd467 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -803,10 +803,8 @@ fi + + if test "x$enable_shared" = xyes ; then + IF_SHARED='' +- IF_NOT_SHARED='#' + else + IF_SHARED='#' +- IF_NOT_SHARED='' + fi + + # Documentation tools +@@ -840,7 +838,6 @@ fi + AC_SUBST(IF_HOGWEED) + AC_SUBST(IF_STATIC) + AC_SUBST(IF_SHARED) +-AC_SUBST(IF_NOT_SHARED) + AC_SUBST(IF_DOCUMENTATION) + AC_SUBST(IF_DLL) + AC_SUBST(IF_MINI_GMP) +diff --git a/hogweed.pc.in b/hogweed.pc.in +index 97fb9d4..839f7d0 100644 +--- a/hogweed.pc.in ++++ b/hogweed.pc.in +@@ -11,9 +11,8 @@ Name: Hogweed + Description: Nettle low-level cryptographic library (public-key algorithms) + URL: http://www.lysator.liu.se/~nisse/nettle + Version: @PACKAGE_VERSION@ +-Requires: @IF_NOT_SHARED@ nettle +-Requires.private: @IF_SHARED@ nettle +-Libs: -L${libdir} -lhogweed @IF_NOT_SHARED@ @LIBS@ +-Libs.private: @IF_SHARED@ @LIBS@ ++Requires.private: nettle ++Libs: -L${libdir} -lhogweed ++Libs.private: @LIBS@ + Cflags: -I${includedir} + +-- +2.1.4 + |