diff options
author | Jinkun Jang <jinkun.jang@samsung.com> | 2013-03-16 01:08:40 +0900 |
---|---|---|
committer | Jinkun Jang <jinkun.jang@samsung.com> | 2013-03-16 01:08:40 +0900 |
commit | 387ee31bd05b154a0c692690bb20e435ca7e7768 (patch) | |
tree | e1d22be0eac29ee22a7919b47fc90a3fcecbcc93 | |
parent | 8a6ea078957a71e285dcf1db46aa1e5d26dfcb3f (diff) | |
download | chromium-387ee31bd05b154a0c692690bb20e435ca7e7768.tar.gz chromium-387ee31bd05b154a0c692690bb20e435ca7e7768.tar.bz2 chromium-387ee31bd05b154a0c692690bb20e435ca7e7768.zip |
merge with mastersubmit/tizen_2.1/20130424.224710submit/tizen/20130517.045811accepted/tizen_2.1/20130425.024356accepted/tizen/20130520.1017242.1b_releasetizen_2.1
-rwxr-xr-x | CMakeLists.txt | 4 | ||||
-rwxr-xr-x | ipc/ipc_message_utils.h | 3 | ||||
-rw-r--r-- | packaging/chromium.changes | 2 | ||||
-rwxr-xr-x | packaging/chromium.spec | 8 |
4 files changed, 9 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 948b61fa490a..a02ca6c7b930 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -46,8 +46,8 @@ CONFIGURE_FILE( @ONLY ) -INSTALL(FILES ${CMAKE_SOURCE_DIR}/${PROJECT_NAME}.pc DESTINATION lib/pkgconfig) -INSTALL(TARGETS ${PROJECT_NAME} DESTINATION lib) +INSTALL(FILES ${CMAKE_SOURCE_DIR}/${PROJECT_NAME}.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig) +INSTALL(TARGETS ${PROJECT_NAME} DESTINATION lib${LIB_SUFFIX}) INSTALL(FILES ${CMAKE_SOURCE_DIR}/log.h DESTINATION include/${PROJECT_NAME}) INSTALL(FILES ${CMAKE_SOURCE_DIR}/base/atomic_ref_count.h DESTINATION include/${PROJECT_NAME}/base) INSTALL(FILES ${CMAKE_SOURCE_DIR}/base/atomicops.h DESTINATION include/${PROJECT_NAME}/base) diff --git a/ipc/ipc_message_utils.h b/ipc/ipc_message_utils.h index 8c2014f35056..a7b78959fb02 100755 --- a/ipc/ipc_message_utils.h +++ b/ipc/ipc_message_utils.h @@ -49,9 +49,8 @@ // code to figure out the message class from its ID. enum IPCMessageStart { AutomationMsgStart = 0, - PushServiceMsgStart, CmcStrRegistryManagerStart, - LastIPCMsgStart // Must come last. + LastIPCMsgStart }; class FilePath; diff --git a/packaging/chromium.changes b/packaging/chromium.changes new file mode 100644 index 000000000000..771dbc85fffc --- /dev/null +++ b/packaging/chromium.changes @@ -0,0 +1,2 @@ +* Fri Jan 18 2013 Anas Nashif <anas.nashif@intel.com> submit/trunk/20121227.051414@062f276 +- Support installation in lib64 diff --git a/packaging/chromium.spec b/packaging/chromium.spec index c2d7659b80fe..3c36bc72c396 100755 --- a/packaging/chromium.spec +++ b/packaging/chromium.spec @@ -1,9 +1,9 @@ Name: chromium Summary: chromium library Version: 1.0 -Release: 2 +Release: 1 Group: TO_BE/FILLED_IN -License: TO BE FILLED IN +License: BSD Source0: %{name}-%{version}.tar.gz BuildRequires: cmake @@ -24,9 +24,9 @@ chromium library (devel) %build MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'` %ifarch %{ix86} -CXXFLAGS="$CXXFLAGS -D_OSP_DEBUG_ -D_OSP_X86_ -D_OSP_EMUL_" cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DFULLVER=%{version} -DMAJORVER=${MAJORVER} +CXXFLAGS="$CXXFLAGS -D_OSP_DEBUG_ -D_OSP_X86_ -D_OSP_EMUL_" %cmake . -DFULLVER=%{version} -DMAJORVER=${MAJORVER} %else -CXXFLAGS="$CXXFLAGS -D_OSP_DEBUG_ -D_OSP_ARMEL_" cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DFULLVER=%{version} -DMAJORVER=${MAJORVER} +CXXFLAGS="$CXXFLAGS -D_OSP_DEBUG_ -D_OSP_ARMEL_" %cmake . -DFULLVER=%{version} -DMAJORVER=${MAJORVER} %endif # Call make instruction with smp support make %{?jobs:-j%jobs} |