From: Baptiste DURAND Date: Wed, 4 Sep 2013 09:01:49 +0000 (+0200) Subject: Fix Build of Privacy-manager package X-Git-Tag: rev_0.4~234^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=45396a285b4acea944604b96b5177c9583847872;p=scm%2Fbb%2Ftizen.git Fix Build of Privacy-manager package Signed-off-by: Baptiste DURAND --- diff --git a/meta-wrt-tizen/recipes-wrt/privacy-manager/privacy-manager-extraconf.inc b/meta-wrt-tizen/recipes-wrt/privacy-manager/privacy-manager-extraconf.inc index e69de29..d589148 100644 --- a/meta-wrt-tizen/recipes-wrt/privacy-manager/privacy-manager-extraconf.inc +++ b/meta-wrt-tizen/recipes-wrt/privacy-manager/privacy-manager-extraconf.inc @@ -0,0 +1,7 @@ +SRC_URI += " file://FixBuildError.patch " + +do_patch_append () { + cat ${WORKDIR}/FixBuildError.patch | patch -s -p1 --fuzz=2 +} + + diff --git a/meta-wrt-tizen/recipes-wrt/privacy-manager/privacy-manager/FixBuildError.patch b/meta-wrt-tizen/recipes-wrt/privacy-manager/privacy-manager/FixBuildError.patch new file mode 100644 index 0000000..5055822 --- /dev/null +++ b/meta-wrt-tizen/recipes-wrt/privacy-manager/privacy-manager/FixBuildError.patch @@ -0,0 +1,31 @@ +diff --git a/pkgmgr_plugin/CMakeLists.txt b/pkgmgr_plugin/CMakeLists.txt +index 40162b8..6dacd97 100644 +--- a/pkgmgr_plugin/CMakeLists.txt ++++ b/pkgmgr_plugin/CMakeLists.txt +@@ -7,16 +7,10 @@ SET(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/cmake_build_tmp/output) + INCLUDE(FindPkgConfig) + pkg_check_modules(pkg REQUIRED glib-2.0 dlog libxml-2.0 ) + +-FOREACH(flag ${privileges_CFLAGS}) ++FOREACH(flag ${pkg_CFLAGS}) + SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}") + ENDFOREACH(flag) +- + INCLUDE_DIRECTORIES( +- /usr/include +- /usr/include/glib-2.0 +- /usr/include/libxml2 +- /usr/include/package_manager +- /usr/include/dlog + "${CMAKE_SOURCE_DIR}/client/inc/" + "${CMAKE_SOURCE_DIR}/common/inc/" + ) +@@ -46,7 +40,7 @@ SET(CMAKE_SHARED_LINKER_FLAGS -Wl,--no-undefined) + + TARGET_LINK_LIBRARIES(${this_target} ${pkg_LDFLAGS} ${pkg_LIBRARIES}) + TARGET_LINK_LIBRARIES(${this_target} "-lprivacy-manager-client" "-L../client" ) +- ++SET_TARGET_PROPERTIES(${this_target} PROPERTIES COMPILE_FLAGS "${EXTRA_CFLAGS}") + ADD_CUSTOM_COMMAND(TARGET ${this_target} + POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy ${LIBRARY_OUTPUT_PATH}/${CMAKE_SHARED_LIBRARY_PREFIX}${this_target}${CMAKE_SHARED_LIBRARY_SUFFIX} ${LIBRARY_OUTPUT_PATH}/debug/${CMAKE_SHARED_LIBRARY_PREFIX}${this_target}${CMAKE_SHARED_LIBRARY_SUFFIX} diff --git a/proto-meta-Tizen_ivi_3.0/specfile-patch/privacy-manager-yocto.spec.patch b/proto-meta-Tizen_ivi_3.0/specfile-patch/privacy-manager-yocto.spec.patch new file mode 100644 index 0000000..85b8c93 --- /dev/null +++ b/proto-meta-Tizen_ivi_3.0/specfile-patch/privacy-manager-yocto.spec.patch @@ -0,0 +1,13 @@ +diff --git a/packaging/privacy-manager.spec b/packaging/privacy-manager.spec +index fcded9b..18fbf5f 100755 +--- a/packaging/privacy-manager.spec ++++ b/packaging/privacy-manager.spec +@@ -139,7 +139,7 @@ fi + %defattr(-,root,root,-) + %manifest packaging/privacy-manager-server.manifest + %{_bindir}/* +-%{_prefix}/lib/systemd/* ++%{_unitdir}/* + /opt/dbspace/.privacylist.db + + %files -n privacy-manager-server-devel