diff options
| author | Niels Kristian Bech Jensen <nkbj1970@hotmail.com> | 2013-12-26 02:40:55 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2013-12-26 02:40:55 (GMT) |
| commit | 8e1b134ec0e9491a73a257a39250baea35f19e4c (patch) | |
| tree | 85e4cfdd559481ed20ec11d0a8c25dd8ee49fe97 /src/exiv2-1-lpsapi.patch | |
| parent | 49ddd67b2653b4ed2f5073e5d0d66cff10529d09 (diff) | |
| download | mxe-8e1b134ec0e9491a73a257a39250baea35f19e4c.zip mxe-8e1b134ec0e9491a73a257a39250baea35f19e4c.tar.gz mxe-8e1b134ec0e9491a73a257a39250baea35f19e4c.tar.bz2 | |
package exiv2: use upstream fix for link to libpsapi
Diffstat (limited to 'src/exiv2-1-lpsapi.patch')
| -rw-r--r-- | src/exiv2-1-lpsapi.patch | 36 |
1 files changed, 32 insertions, 4 deletions
diff --git a/src/exiv2-1-lpsapi.patch b/src/exiv2-1-lpsapi.patch index 7048ef9..109f98a 100644 --- a/src/exiv2-1-lpsapi.patch +++ b/src/exiv2-1-lpsapi.patch @@ -1,13 +1,41 @@ -# This file is part of MXE. -# See index.html for further information. +This file is part of MXE. +See index.html for further information. + +This patch is adapted from the Exiv2 svn trunk revision 3210. diff -ur a/config/exiv2.pc.in b/config/exiv2.pc.in --- a/config/exiv2.pc.in 2011-07-29 14:11:16.000000000 +0200 -+++ b/config/exiv2.pc.in 2013-12-07 07:45:22.094144853 +0100 ++++ b/config/exiv2.pc.in 2013-12-20 06:44:37.265187475 +0100 @@ -7,5 +7,5 @@ Description: Image metadata library and tools Version: @PACKAGE_VERSION@ Libs: -L${libdir} -lexiv2 @EXV_LIB_STATIC@ -Libs.private: @EXPAT_LDFLAGS@ @LTLIBINTL@ @LTLIBICONV@ @LIBS@ @EXPAT_LIBS@ -+Libs.private: @EXPAT_LDFLAGS@ @LTLIBINTL@ @LTLIBICONV@ @LIBS@ @EXPAT_LIBS@ -lpsapi ++Libs.private: @EXPAT_LDFLAGS@ @LTLIBINTL@ @LTLIBICONV@ @LIBS@ @EXPAT_LIBS@ @EXV_LIBPSAPI@ Cflags: -I${includedir} +diff -ur a/configure b/configure +--- a/configure 2013-12-01 13:29:47.000000000 +0100 ++++ b/configure 2013-12-20 06:44:37.273191477 +0100 +@@ -774,6 +774,7 @@ + ac_header_list= + ac_subst_vars='LTLIBOBJS + LIBOBJS ++EXV_LIBPSAPI + EXV_LIB_STATIC + ENABLE_XMP + EXPAT_LIBS +@@ -17068,11 +17069,14 @@ + # version.cpp requires link to psapi/Windows and dl/Unix builds + case "$host_os" in + *mingw* | *cygwin*) ++ EXV_LIBPSAPI="-lpsapi" + LDFLAGS="$LDFLAGS -no-undefined -lpsapi" ;; + *) ++ EXV_LIBPSAPI= + LDFLAGS="$LDFLAGS -ldl" ;; + esac + ++ + # --------------------------------------------------------------------------- + # Create output files. + # --------------------------------------------------------------------------- |