[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

Maximiliano Curia maxy at moszumanska.debian.org
Thu Jul 13 17:44:04 UTC 2017


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=3824b03

The following commit has been merged in the master branch:
commit 3824b03136675750b33bf5363e83bd1985287b40
Author: nkbj <nkbj1970 at hotmail.com>
Date:   Sat Dec 14 00:51:48 2013 +0000

    Add -lpsapi to Libs.private in exiv2.pc on MinGW/Cygwin builds. Needed for static libraries.
---
 config/configure.ac | 3 +++
 config/exiv2.pc.in  | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/config/configure.ac b/config/configure.ac
index cdba097..2c40af9 100644
--- a/config/configure.ac
+++ b/config/configure.ac
@@ -211,10 +211,13 @@ AC_SUBST(EXV_LIB_STATIC)
 # 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
+AC_SUBST(EXV_LIBPSAPI)
 
 # ---------------------------------------------------------------------------
 # Create output files.
diff --git a/config/exiv2.pc.in b/config/exiv2.pc.in
index 409458c..a45ad21 100644
--- a/config/exiv2.pc.in
+++ b/config/exiv2.pc.in
@@ -7,5 +7,5 @@ Name: exiv2
 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@ @EXV_LIBPSAPI@
 Cflags: -I${includedir}

-- 
exiv2 packaging



More information about the pkg-kde-commits mailing list