Fix cmake path /etc for native build

 - fix pkgmgr

Change-Id: I06eeb741e680805e2e00ff06b45d372d1013e008
Signed-off-by: Ronan Le Martret <ronan@fridu.net>

diff --git a/recipes-devtools/cmake/cmake-native_%.bbappend b/recipes-devtools/cmake/cmake-native_%.bbappend
index ebec5e8..acc20c1 100644 (file)
--- a/recipes-devtools/cmake/cmake-native_%.bbappend
+++ b/recipes-devtools/cmake/cmake-native_%.bbappend
@@ -1,7 +1,8 @@
 FILESEXTRAPATHS_append := "${THISDIR}/files"
 
-SRC_URI += "file://TizenCommon.cmake"
+SRC_URI += "file://TizenCommon_native.cmake"
 
 do_install_append() {
-    install -m 644 ${WORKDIR}/TizenCommon.cmake ${D}${datadir}/cmake-${CMAKE_MAJOR_VERSION}/Modules
+    mv ${WORKDIR}/TizenCommon_native.cmake ${WORKDIR}/TizenCommon.cmake 
+    install -m 644 ${WORKDIR}/TizenCommon.cmake ${D}${datadir}/cmake-${CMAKE_MAJOR_VERSION}/Modules/
 }
\ No newline at end of file

diff --git a/recipes-devtools/cmake/files/TizenCommon_native.cmake b/recipes-devtools/cmake/files/TizenCommon_native.cmake
new file mode 100644 (file)
index 0000000..7cef5ed
--- /dev/null
+++ b/recipes-devtools/cmake/files/TizenCommon_native.cmake
@@ -0,0 +1,31 @@
+# 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/recipes-tizen/pkgmgr/files/Add_extralib.diff b/recipes-tizen/pkgmgr/files/Add_extralib.diff
deleted file mode 100644 (file)
index 1995b96..0000000
--- a/recipes-tizen/pkgmgr/files/Add_extralib.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-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/recipes-tizen/pkgmgr/pkgmgr-extraconf.inc b/recipes-tizen/pkgmgr/pkgmgr-extraconf.inc
index 2ce18d4..94c2fe4 100644 (file)
--- a/recipes-tizen/pkgmgr/pkgmgr-extraconf.inc
+++ b/recipes-tizen/pkgmgr/pkgmgr-extraconf.inc
@@ -1,4 +1,3 @@
-SRC_URI += "file://Add_extralib.diff"
 SRC_URI_append_class-native = " file://remove-dlog-for-native-build.patch"
 
 do_install_append() {