diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2017-01-15 16:31:33 (GMT) |
|---|---|---|
| committer | Mark Brand <mabrand@mabrand.nl> | 2017-01-15 16:32:58 (GMT) |
| commit | 98907c18f447bd3807fdafd3184dd76b67d0dfaf (patch) | |
| tree | c632d24be0d7259dd17429932ffef8173e3cc7da /src/libzip-1-fixes.patch | |
| parent | 8afea6e6ebe9598adcec3c7c6f8ba7b0b4a2147d (diff) | |
| download | mxe-98907c18f447bd3807fdafd3184dd76b67d0dfaf.zip mxe-98907c18f447bd3807fdafd3184dd76b67d0dfaf.tar.gz mxe-98907c18f447bd3807fdafd3184dd76b67d0dfaf.tar.bz2 | |
update: gsl libzip
Diffstat (limited to 'src/libzip-1-fixes.patch')
| -rw-r--r-- | src/libzip-1-fixes.patch | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/src/libzip-1-fixes.patch b/src/libzip-1-fixes.patch new file mode 100644 index 0000000..03ff845 --- /dev/null +++ b/src/libzip-1-fixes.patch @@ -0,0 +1,50 @@ +This file is part of MXE. See LICENSE.md for licensing information. + +From 8aa28e38f7b753c40fa1d107d88a5e1281a09dec Mon Sep 17 00:00:00 2001 +From: Sylvain Beucler <beuc@beuc.net> +Date: Sun, 15 Jan 2017 17:25:49 +0100 +Subject: [PATCH 1/2] static build fixes + + +diff --git a/lib/zip.h b/lib/zip.h +index 27141b3..8d85e61 100644 +--- a/lib/zip.h ++++ b/lib/zip.h +@@ -37,9 +37,9 @@ + + #ifndef ZIP_EXTERN + # ifndef ZIP_STATIC +-# ifdef _WIN32 ++# ifdef _MSC_VER + # define ZIP_EXTERN __declspec(dllimport) +-# elif defined(__GNUC__) && __GNUC__ >= 4 ++# elif (defined(__GNUC__) && __GNUC__ >= 4) && !defined(_WIN32) + # define ZIP_EXTERN __attribute__ ((visibility ("default"))) + # else + # define ZIP_EXTERN +-- +2.9.3 + + +From d7b8bf5ccfbedfc10bddaa46f19c08635f1fa17f Mon Sep 17 00:00:00 2001 +From: Sylvain Beucler <beuc@beuc.net> +Date: Sun, 15 Jan 2017 17:28:42 +0100 +Subject: [PATCH 2/2] pkgconfig private + + +diff --git a/libzip.pc.in b/libzip.pc.in +index ef8af2d..f053510 100644 +--- a/libzip.pc.in ++++ b/libzip.pc.in +@@ -9,6 +9,7 @@ zipcmp=@prefix@/bin/zipcmp + Name: libzip + Description: library for handling zip archives + Version: @VERSION@ +-Libs: @PKG_CONFIG_RPATH@ -L${libdir} -lzip @LIBS@ ++Libs: @PKG_CONFIG_RPATH@ -L${libdir} -lzip + Cflags: -I${includedir} -I${libincludedir} ++Requires.private: zlib + +-- +2.9.3 + |