Fix lib var path for x64 build

  - Use %cmake macro to set default path
  - Change library path var in *.pc.in, CMakeLists.txt
  - x64 build : change size_t to unsigned int : Source file

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 323e67d..fb066d9 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -90,12 +90,12 @@ TARGET_LINK_LIBRARIES(${TARGET_SIGN_TOOL}
 CONFIGURE_FILE(cert-svc.pc.in cert-svc.pc @ONLY)
 CONFIGURE_FILE(cert-svc-vcore.pc.in cert-svc-vcore.pc @ONLY)
 
-INSTALL(TARGETS ${TARGET_CERT_SVC_LIB} DESTINATION ${LIBDIR} COMPONENT RuntimeLibraries)
+INSTALL(TARGETS ${TARGET_CERT_SVC_LIB} DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries)
 INSTALL(PROGRAMS ${TARGET_SIGN_TOOL} DESTINATION ${BINDIR})
 INSTALL(FILES
     ${CMAKE_CURRENT_BINARY_DIR}/cert-svc.pc
     ${CMAKE_CURRENT_BINARY_DIR}/cert-svc-vcore.pc
-    DESTINATION ${LIBDIR}/pkgconfig
+    DESTINATION ${LIB_INSTALL_DIR}/pkgconfig
 )
 INSTALL(FILES ${PROJECT_SOURCE_DIR}/targetinfo DESTINATION /opt/share/cert-svc/)
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/cert-service.h DESTINATION ${INCLUDEDIR})

diff --git a/cert-svc-vcore.pc.in b/cert-svc-vcore.pc.in
index bf42d5a..2523cd4 100644 (file)
--- a/cert-svc-vcore.pc.in
+++ b/cert-svc-vcore.pc.in
@@ -1,6 +1,6 @@
 prefix=@PREFIX@
 exec_prefix=@EXEC_PREFIX@
-libdir=@LIBDIR@
+libdir=@LIB_INSTALL_DIR@
 includedir=@INCLUDEDIR@/cert-svc
 
 Name: cert-svc-vcore

diff --git a/cert-svc.pc.in b/cert-svc.pc.in
index 6b0ebd2..1983766 100644 (file)
--- a/cert-svc.pc.in
+++ b/cert-svc.pc.in
@@ -1,6 +1,6 @@
 prefix=@PREFIX@
 exec_prefix=@EXEC_PREFIX@
-libdir=@LIBDIR@
+libdir=@LIB_INSTALL_DIR@
 includedir=@INCLUDEDIR@
 
 Name: certification-service

diff --git a/packaging/cert-svc.spec b/packaging/cert-svc.spec
index 05b86f9..5f2ae53 100644 (file)
--- a/packaging/cert-svc.spec
+++ b/packaging/cert-svc.spec
@@ -44,12 +44,12 @@ Certification service (developement files)
 
 %build
 %{!?build_type:%define build_type "Release"}
-cmake . -DPREFIX=%{_prefix} \
-        -DEXEC_PREFIX=%{_exec_prefix} \
-        -DLIBDIR=%{_libdir} \
-        -DBINDIR=%{_bindir} \
-        -DINCLUDEDIR=%{_includedir} \
-        -DCMAKE_BUILD_TYPE=%{build_type}
+%cmake . -DPREFIX=%{_prefix} \
+         -DEXEC_PREFIX=%{_exec_prefix} \
+         -DBINDIR=%{_bindir} \
+         -DINCLUDEDIR=%{_includedir} \
+         -DCMAKE_BUILD_TYPE=%{build_type}
+
 make %{?jobs:-j%jobs}
 
 %install

diff --git a/vcore/src/CMakeLists.txt b/vcore/src/CMakeLists.txt
index 031158e..7580a7a 100644 (file)
--- a/vcore/src/CMakeLists.txt
+++ b/vcore/src/CMakeLists.txt
@@ -95,7 +95,7 @@ TARGET_LINK_LIBRARIES(${TARGET_VCORE_LIB}
   )
 
 INSTALL(TARGETS ${TARGET_VCORE_LIB}
-    DESTINATION ${LIBDIR}
+    DESTINATION ${LIB_INSTALL_DIR}
     )
 
 INSTALL(FILES

diff --git a/vcore/src/vcore/Certificate.cpp b/vcore/src/vcore/Certificate.cpp
index 45c751d..0b6e55a 100644 (file)
--- a/vcore/src/vcore/Certificate.cpp
+++ b/vcore/src/vcore/Certificate.cpp
@@ -136,7 +136,7 @@ bool Certificate::isSignedBy(const CertificatePtr &parent) const
 Certificate::Fingerprint Certificate::getFingerprint(
         Certificate::FingerprintType type) const
 {
-    size_t fingerprintlength = EVP_MAX_MD_SIZE;
+    unsigned int fingerprintlength = EVP_MAX_MD_SIZE; //EVP_MAX_MD_SIZE is smaller than  2^64
     unsigned char fingerprint[EVP_MAX_MD_SIZE];
     Fingerprint raw;