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

Maximiliano Curia maxy at moszumanska.debian.org
Thu Jul 13 17:43:12 UTC 2017


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

The following commit has been merged in the master branch:
commit 6788fe8ff609ff9a09038574caaee91cce5cde38
Author: Robin Mills <robin at clanmills.com>
Date:   Tue Jul 10 06:48:09 2012 +0000

    ./configure --disable-visiblity is default on cygwin.
---
 config/configure.ac | 7 ++++++-
 src/version.cpp     | 4 +++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/config/configure.ac b/config/configure.ac
index 56fc54a..482f4be 100644
--- a/config/configure.ac
+++ b/config/configure.ac
@@ -100,9 +100,14 @@ fi
 AC_SUBST(DEP_TRACKING,$DEP_TRACKING)
 
 AC_MSG_CHECKING([whether to enable symbol visibility support])
+visibility=yes
+# visibility support in cygwin/ming generates 1000's of warning, set off by default
+case "$host_os" in
+	*mingw* | *cygwin*) visiblity=no  ;;
+esac
 AC_ARG_ENABLE(visibility,
     [  --disable-visibility    do not use symbol visibility support ],
-    VISIBILITY_SUPPORT=$enableval, VISIBILITY_SUPPORT=yes)
+    VISIBILITY_SUPPORT=$enableval, VISIBILITY_SUPPORT=$visiblity)
 AC_MSG_RESULT($VISIBILITY_SUPPORT)
 if test "$VISIBILITY_SUPPORT" = "yes"; then
     # Sun Studio C++ compiler (which apparently ignores -fvisibility-inlines-hidden)
diff --git a/src/version.cpp b/src/version.cpp
index 652370b..765fa90 100644
--- a/src/version.cpp
+++ b/src/version.cpp
@@ -188,6 +188,8 @@ EXIV2API void dumpLibraryInfo(std::ostream& os)
 	char proc[100];
 	sprintf(proc,"/proc/%d/exe", getpid());
 	path_l = readlink (proc, path, path_max);
+#elif defined(__CYGWIN__)
+	bReport=true;
 #endif
 
 	if ( bReport ) {
@@ -195,7 +197,7 @@ EXIV2API void dumpLibraryInfo(std::ostream& os)
 		if ( path_l > 0 &&  path_l < path_max ) {
 			path[path_l]=0;
 			os << szBuilder << "executable=" << path << std::endl;
-			os << szBuilder << "date=\"" << __DATE__ << "\",time=" __TIME__ << std::endl;
 		}
+		os << szBuilder << "date=\"" << __DATE__ << "\",time=" __TIME__ << std::endl;
 	}
 }

-- 
exiv2 packaging



More information about the pkg-kde-commits mailing list