diff options
| author | Vyacheslav Barinov <v.barinov@samsung.com> | 2014-08-18 10:58:05 +0400 |
|---|---|---|
| committer | Vyacheslav Barinov <v.barinov@samsung.com> | 2014-08-18 11:56:16 +0400 |
| commit | a59f1b1f2853ba347705bbdd97f587ebe946bb80 (patch) | |
| tree | 10036f9011a7fde7f81d1d2ea9f1a1f365b6896b | |
| parent | c26b87d4f531ab6764c0c194bb27d73e48eb1a65 (diff) | |
| download | libcryptsvc-a59f1b1f2853ba347705bbdd97f587ebe946bb80.tar.gz libcryptsvc-a59f1b1f2853ba347705bbdd97f587ebe946bb80.tar.bz2 libcryptsvc-a59f1b1f2853ba347705bbdd97f587ebe946bb80.zip | |
Fixed packaging for 64bit architecturestizen_3.0_ivi_releasetizen_3.0.m2.a1_tv_releasetizen_3.0.m2.a1_mobile_releasetizen_3.0.m1_tv_releasetizen_3.0.m1_mobile_releasetizen_3.0.m14.3_ivi_releasetizen_3.0.2014.q3_common_releasesubmit/tizen_mobile/20141120.000000submit/tizen/20141002.092832accepted/tizen/ivi/20141006.161445accepted/tizen/common/20141002.100449tizen_3.0_ivitizen_3.0.m1_tvtizen_3.0.m1_mobiletizen_3.0.m14.3_ivitizen_3.0.2015.q2_commontizen_3.0.2015.q1_commontizen_3.0.2014.q4_commontizen_3.0.2014.q3_commonaccepted/tizen_3.0.m14.3_iviaccepted/tizen_3.0.2014.q3_common
The package has a hardcoded paths to libdir in CMakeLists.txt file which works
for 32-bit architectures, but trying to build package on aarch64 makes a problem
in packaging section because %{_libdir} macros has "/usr/lib64" on 64bit
architectures.
Now CMake uses paths defined by build system: it changes nothing for 32bit
architecture but packaging won't fail for 64bit builds anymore
Change-Id: I2a0fc1da429585a7bd1c0bffb0c8b5f50eab9b8e
Signed-off-by: Vyacheslav Barinov <v.barinov@samsung.com>
| -rw-r--r-- | CMakeLists.txt | 7 | ||||
| -rw-r--r-- | cryptsvc.pc.in | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 456b5b6..e531784 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,6 @@ PROJECT(cryptsvc C) SET(PREFIX ${CMAKE_INSTALL_PREFIX}) SET(EXEC_PREFIX "\${prefix}") -SET(LIBDIR "\${prefix}/lib") SET(INCLUDEDIR "\${prefix}/include") INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include) @@ -114,9 +113,9 @@ SET(PC_LDFLAGS " -l${PROJECT_NAME} ") SET(PC_REQUIRED ${pc_requires}) CONFIGURE_FILE(${PROJECT_NAME}.pc.in ${PROJECT_NAME}.pc @ONLY) -INSTALL(FILES ${PROJECT_NAME}.pc DESTINATION lib/pkgconfig) -INSTALL(TARGETS ${PROJECT_NAME} DESTINATION lib) -INSTALL(TARGETS ${LIBTZ_SO} DESTINATION lib) +INSTALL(FILES ${PROJECT_NAME}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) +INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR}) +INSTALL(TARGETS ${LIBTZ_SO} DESTINATION ${LIB_INSTALL_DIR}) INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ DESTINATION ${INCLUDEDIR}) ADD_DEFINITIONS(-D_bool_cryptsvc) diff --git a/cryptsvc.pc.in b/cryptsvc.pc.in index 2cd5754..be4fe2f 100644 --- a/cryptsvc.pc.in +++ b/cryptsvc.pc.in @@ -1,8 +1,8 @@ # Package Information for pkg-config prefix=@PREFIX@ -libdir=@PREFIX@/lib -includedir=@PREFIX@/include +libdir=@LIB_INSTALL_DIR@ +includedir=@INCLUDE_INSTALL_DIR@ Name: @PC_NAME@ Description: @DESCRIPTION@ |