Mailinglist Archive: zypp-devel (27 mails)

< Previous Next >
[zypp-devel] [PATCH for libzypp-bindings] Fix readlink error
  • From: Yi Yang <yi.y.yang@xxxxxxxxx>
  • Date: Tue, 21 Dec 2010 10:42:27 +0800
  • Message-id: <20101221024227.GA14205@xxxxxxxxxxxxxxxxxxxxxxx>
From 244df83a7c0b95c27e5d8cfe931ae4afed93d31e Mon Sep 17 00:00:00 2001
From: Yi Yang <yi.y.yang@xxxxxxxxx>
Date: Tue, 21 Dec 2010 10:27:16 +0800
Subject: [PATCH] Fix readlink error

Note: readlink path may be /bin/readlink or /usr/bin/readlink, this
depends on Linux distros, so using FIND_PROGRAM is better.
---
CMakeLists.txt | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c24a4a8..e823062 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -47,7 +47,8 @@ FIND_PACKAGE(SWIG REQUIRED)
FIND_PACKAGE(Zypp REQUIRED)

# determine zypp version
-EXECUTE_PROCESS(COMMAND "/usr/bin/readlink" ${ZYPP_LIBRARY} OUTPUT_VARIABLE
ZYPP_SOFILE)
+FIND_PROGRAM(READ_LINK readlink)
+EXECUTE_PROCESS(COMMAND "${READ_LINK}" ${ZYPP_LIBRARY} OUTPUT_VARIABLE
ZYPP_SOFILE)

# match number at end, strip trailing \n by using a sub-match
STRING(REGEX MATCH "([0-9]+)\n$" ZYPP_VERSION "${ZYPP_SOFILE}")
--
1.6.0.6

--
To unsubscribe, e-mail: zypp-devel+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: zypp-devel+help@xxxxxxxxxxxx

< Previous Next >
This Thread
Follow Ups