From: Ronan Le Martret <ronan@fridu.net>
Date: Fri, 20 Jun 2014 15:10:20 +0000 (+0200)
Subject: meta-tizen: Fix slp-pkgmgr
X-Git-Tag: rev_ivi_2015_02_04~481
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=61eec7b97b7b0d06438f6ca84f38be6240b090ea;p=scm%2Fbb%2Ftizen-distro.git

meta-tizen: Fix slp-pkgmgr

Change-Id: Ifd31d9da71ebce8939f70531e7654ece638a3c36
(From meta-tizen rev: 0525043d83e1b9f2868636db3917b9d96b6251e4)

Signed-off-by: Ronan Le Martret <ronan@fridu.net>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
---

diff --git a/meta-tizen/recipes-devtools/cmake/files/TizenCommon.cmake b/meta-tizen/recipes-devtools/cmake/files/TizenCommon.cmake
index 2a83785..690cad3 100644
--- a/meta-tizen/recipes-devtools/cmake/files/TizenCommon.cmake
+++ b/meta-tizen/recipes-devtools/cmake/files/TizenCommon.cmake
@@ -1,12 +1,12 @@
 # Copied from libzypp
 # Library
 IF ( DEFINED LIB )
-  SET ( LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${LIB}" )
+  SET ( LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib" )
 ELSE ( DEFINED  LIB )
   IF (CMAKE_SIZEOF_VOID_P MATCHES "8")
     SET( LIB_SUFFIX "64" )
   ENDIF(CMAKE_SIZEOF_VOID_P MATCHES "8")
-  SET ( LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" )
+  SET ( LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib" )
 ENDIF ( DEFINED  LIB )
 MESSAGE(STATUS "Libraries will be installed in ${LIB_INSTALL_DIR}" )
 
diff --git a/meta-tizen/recipes-tizen/slp-pkgmgr/files/Add_extralib.diff b/meta-tizen/recipes-tizen/slp-pkgmgr/files/Add_extralib.diff
new file mode 100644
index 0000000..1995b96
--- /dev/null
+++ b/meta-tizen/recipes-tizen/slp-pkgmgr/files/Add_extralib.diff
@@ -0,0 +1,28 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e0a9211..96a28f1 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-# 
++#
+ # Copyright (c) 2008 ~ 2010 Samsung Electronics Co., Ltd.
+ # All rights reserved
+ #
+@@ -37,7 +37,7 @@ FOREACH(flag ${pkgs_CFLAGS})
+ 	SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
+ ENDFOREACH(flag)
+ 
+-pkg_check_modules(libpkgs REQUIRED dbus-glib-1 dlog ail pkgmgr-parser pkgmgr-info iniparser libtzplatform-config)
++pkg_check_modules(libpkgs REQUIRED dbus-glib-1 dlog ail pkgmgr-parser pkgmgr-info iniparser libtzplatform-config xdgmime)
+ 
+ FOREACH(flag ${libpkgs_CFLAGS})
+ 	SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
+@@ -76,7 +76,7 @@ ADD_LIBRARY(${PKGMGR_CLIENT} SHARED ${libpkgmgr-client_SOURCES})
+ SET_TARGET_PROPERTIES(${PKGMGR_CLIENT} PROPERTIES SOVERSION ${VERSION_MAJOR})
+ SET_TARGET_PROPERTIES(${PKGMGR_CLIENT} PROPERTIES VERSION ${VERSION})
+ SET_TARGET_PROPERTIES(${PKGMGR_CLIENT} PROPERTIES COMPILE_FLAGS "${libpkgmgr-client_CFLAGS}")
+-TARGET_LINK_LIBRARIES(${PKGMGR_CLIENT} pkgmgr_installer_client pkgmgr_installer_status_broadcast_server pkgmgr-info ${libpkgs_LDFLAGS})
++TARGET_LINK_LIBRARIES(${PKGMGR_CLIENT} pkgmgr_installer_client pkgmgr_installer_status_broadcast_server pkgmgr-info ${libpkgs_LDFLAGS} -ldl)
+ ###################################################################################################
+ 
+ ###################################################################################################
diff --git a/meta-tizen/recipes-tizen/slp-pkgmgr/slp-pkgmgr-extraconf.inc b/meta-tizen/recipes-tizen/slp-pkgmgr/slp-pkgmgr-extraconf.inc
index b95d6a2..f6bd0d6 100644
--- a/meta-tizen/recipes-tizen/slp-pkgmgr/slp-pkgmgr-extraconf.inc
+++ b/meta-tizen/recipes-tizen/slp-pkgmgr/slp-pkgmgr-extraconf.inc
@@ -1,8 +1 @@
-#inherit cmake
-
-#B = "${S}"
-
-
-
-
-
+SRC_URI += "file://Add_extralib.diff"
\ No newline at end of file