From f750081cf55069a92171dd58055343e8209d56a8 Mon Sep 17 00:00:00 2001
From: Ronan Le Martret <ronan@fridu.net>
Date: Wed, 15 Oct 2014 15:55:46 +0200
Subject: [PATCH] meta-tizen: Revert "Fix cmake path /etc for native build"

This reverts commit bc88ea0677424802af5d7107c8e11062946ee2f6.
(From meta-tizen rev: e5c41dacf0cf7107462193d11df5cb24a5bfaced)

Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
---
 .../recipes-devtools/cmake/cmake-native_%.bbappend |  5 ++--
 .../cmake/files/TizenCommon_native.cmake           | 31 ----------------------
 .../recipes-tizen/pkgmgr/files/Add_extralib.diff   | 28 +++++++++++++++++++
 .../recipes-tizen/pkgmgr/pkgmgr-extraconf.inc      |  1 +
 4 files changed, 31 insertions(+), 34 deletions(-)
 delete mode 100644 meta-tizen/recipes-devtools/cmake/files/TizenCommon_native.cmake
 create mode 100644 meta-tizen/recipes-tizen/pkgmgr/files/Add_extralib.diff

diff --git a/meta-tizen/recipes-devtools/cmake/cmake-native_%.bbappend b/meta-tizen/recipes-devtools/cmake/cmake-native_%.bbappend
index acc20c1..ebec5e8 100644
--- a/meta-tizen/recipes-devtools/cmake/cmake-native_%.bbappend
+++ b/meta-tizen/recipes-devtools/cmake/cmake-native_%.bbappend
@@ -1,8 +1,7 @@
 FILESEXTRAPATHS_append := "${THISDIR}/files"
 
-SRC_URI += "file://TizenCommon_native.cmake"
+SRC_URI += "file://TizenCommon.cmake"
 
 do_install_append() {
-    mv ${WORKDIR}/TizenCommon_native.cmake ${WORKDIR}/TizenCommon.cmake 
-    install -m 644 ${WORKDIR}/TizenCommon.cmake ${D}${datadir}/cmake-${CMAKE_MAJOR_VERSION}/Modules/
+    install -m 644 ${WORKDIR}/TizenCommon.cmake ${D}${datadir}/cmake-${CMAKE_MAJOR_VERSION}/Modules
 }
\ No newline at end of file
diff --git a/meta-tizen/recipes-devtools/cmake/files/TizenCommon_native.cmake b/meta-tizen/recipes-devtools/cmake/files/TizenCommon_native.cmake
deleted file mode 100644
index 7cef5ed..0000000
--- a/meta-tizen/recipes-devtools/cmake/files/TizenCommon_native.cmake
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copied from libzypp
-# Library
-IF ( DEFINED 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" )
-ENDIF ( DEFINED  LIB )
-MESSAGE(STATUS "Libraries will be installed in ${LIB_INSTALL_DIR}" )
-
-# system configuration dir (etc)
-IF( NOT DEFINED SYSCONFDIR )
-  SET( SYSCONFDIR ${SYSCONF_INSTALL_DIR} )
-ENDIF( NOT DEFINED SYSCONFDIR )
-MESSAGE(STATUS "Config files will be installed in ${SYSCONFDIR}" )
-
-# usr INSTALL_PREFIX
-
-IF( DEFINED CMAKE_INSTALL_PREFIX )
-  SET( INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} )
-ELSE( DEFINED CMAKE_INSTALL_PREFIX )
-  SET( INSTALL_PREFIX /usr )
-ENDIF( DEFINED CMAKE_INSTALL_PREFIX )
-
-# system configuration dir (etc)
-IF( NOT DEFINED MANDIR )
-  SET( MANDIR ${INSTALL_PREFIX}/share/man )
-ENDIF( NOT DEFINED MANDIR )
-MESSAGE( "** Manual files will be installed in ${MANDIR}" )
diff --git a/meta-tizen/recipes-tizen/pkgmgr/files/Add_extralib.diff b/meta-tizen/recipes-tizen/pkgmgr/files/Add_extralib.diff
new file mode 100644
index 0000000..1995b96
--- /dev/null
+++ b/meta-tizen/recipes-tizen/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/pkgmgr/pkgmgr-extraconf.inc b/meta-tizen/recipes-tizen/pkgmgr/pkgmgr-extraconf.inc
index 94c2fe4..2ce18d4 100644
--- a/meta-tizen/recipes-tizen/pkgmgr/pkgmgr-extraconf.inc
+++ b/meta-tizen/recipes-tizen/pkgmgr/pkgmgr-extraconf.inc
@@ -1,3 +1,4 @@
+SRC_URI += "file://Add_extralib.diff"
 SRC_URI_append_class-native = " file://remove-dlog-for-native-build.patch"
 
 do_install_append() {
-- 
2.7.4