kinetic-cpp-client-system-libs.patch

   1 --- kinetic-cpp-client-0.1.1/CMakeLists.txt.orig        2014-09-18 02:14:04.000000000 +0200
   2 +++ kinetic-cpp-client-0.1.1/CMakeLists.txt     2014-10-18 09:52:42.239547308 +0200
   3 @@ -26,13 +26,13 @@
   4      set(CONFIG_HOST_FLAG --host=arm)
   5      set(CHILD_MAKE_FLAGS CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} RANLIB=${CMAKE_RANLIB})
   6    else(${BUILD_FOR_ARM})
   7 -    set(CMAKE_C_COMPILER "gcc")
   8 -    set(CMAKE_CXX_COMPILER "g++")
   9 +    set(CMAKE_C_COMPILER "gcc" CACHE STRING "")
  10 +    set(CMAKE_CXX_COMPILER "g++" CACHE STRING "")
  11      set(OPENSSL_CONFIGURE_COMMAND ../openssl/config -DPURIFY)
  12    endif(${BUILD_FOR_ARM})
  13  endif(APPLE)
  14
  15 -set(CMAKE_CXX_FLAGS "--std=c++0x -Wall -Wextra -Werror -Wno-unknown-warning-option -Wno-unused-parameter -Wno-null-dereference -Wno-unused-local-typedefs -DGTEST_USE_OWN_TR1_TUPLE=1 ${BUILD_PIC_COMPILER_FLAGS}")
  16 +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++0x -Wall -Wextra  -Wno-unused-parameter -Wno-unused-local-typedefs -DGTEST_USE_OWN_TR1_TUPLE=1 ${BUILD_PIC_COMPILER_FLAGS}")
  17
  18  set(TEST_BINARY "kinetic_client_test")
  19  set(TEST_BINARY_PATH ${kinetic_cpp_client_BINARY_DIR}/${TEST_BINARY})
  20 @@ -55,98 +55,17 @@
  21  set(KINETIC_PROTO_VERSION "3.0.0")
  22  set(KINETIC_PROTO_MD5 "85ca027b870811a297c1f6d792498934")
  23
  24 -ExternalProject_add(
  25 -    kinetic-proto
  26 -    PREFIX ${PREFIX}
  27 -    DOWNLOAD_COMMAND curl -L https://github.com/Seagate/kinetic-protocol/archive/${KINETIC_PROTO_VERSION}.tar.gz -o kinetic-proto.tar.gz && openssl md5 kinetic-proto.tar.gz | grep -q ${KINETIC_PROTO_MD5} && rm -rf kinetic-proto && mkdir -p kinetic-proto && tar -xz --strip-components 1 -C kinetic-proto -f kinetic-proto.tar.gz
  28 -    BUILD_IN_SOURCE 1
  29 -    CONFIGURE_COMMAND ""
  30 -    BUILD_COMMAND ""
  31 -    INSTALL_COMMAND ""
  32 -)
  33 -
  34 -ExternalProject_add(
  35 -    gflags
  36 -    PREFIX ${EXTERNAL_PREFIX}
  37 -    URL "${kinetic_cpp_client_SOURCE_DIR}/tarballs/gflags-2.0-no-svn-files.tar.gz"
  38 -    URL_MD5 "9084829124e02a7e6be0f0f824523423"
  39 -    CONFIGURE_COMMAND ../gflags/configure --prefix=${EXTERNAL_PREFIX} --enable-static ${CONFIG_HOST_FLAG} ${CHILD_MAKE_FLAGS} ${PIC_MAKE_FLAGS}
  40 -)
  41 -
  42 -ExternalProject_add(
  43 -    glog
  44 -    PREFIX ${EXTERNAL_PREFIX}
  45 -    URL "${kinetic_cpp_client_SOURCE_DIR}/tarballs/glog-0.3.3.tar.gz"
  46 -    URL_MD5 "a6fd2c22f8996846e34c763422717c18"
  47 -    PATCH_COMMAND sh ${kinetic_cpp_client_SOURCE_DIR}/patches/apply-glog-patches.sh ${kinetic_cpp_client_SOURCE_DIR}
  48 -    CONFIGURE_COMMAND ../glog/configure --prefix=${EXTERNAL_PREFIX} --with-gflags=${EXTERNAL_PREFIX} --enable-static ${CONFIG_HOST_FLAG} ${CHILD_MAKE_FLAGS} ${PIC_MAKE_FLAGS}
  49 -    DEPENDS gflags
  50 -)
  51 -
  52 -ExternalProject_add(
  53 -    gtest
  54 -    PREFIX ${EXTERNAL_PREFIX}
  55 -    URL "${kinetic_cpp_client_SOURCE_DIR}/tarballs/gtest-1.6.0.zip"
  56 -    URL_MD5 "4577b49f2973c90bf9ba69aa8166b786"
  57 -    BUILD_IN_SOURCE 1
  58 -    CONFIGURE_COMMAND ""
  59 -    BUILD_COMMAND ${CMAKE_CXX_COMPILER} -DGTEST_USE_OWN_TR1_TUPLE=1 -I../gtest -I../gtest/include -c ../gtest/src/gtest-all.cc && ar -rv libgtest.a gtest-all.o && ranlib libgtest.a
  60 -    INSTALL_COMMAND ""
  61 -)
  62 -
  63 -ExternalProject_add(
  64 -    gmock
  65 -    PREFIX ${EXTERNAL_PREFIX}
  66 -    URL "${kinetic_cpp_client_SOURCE_DIR}/tarballs/gmock-1.6.0.zip"
  67 -    URL_MD5 "f547f47321ca88d3965ca2efdcc2a3c1"
  68 -    BUILD_IN_SOURCE 1
  69 -    CONFIGURE_COMMAND ""
  70 -    BUILD_COMMAND ${CMAKE_CXX_COMPILER} -DGTEST_USE_OWN_TR1_TUPLE=1 -I../gmock -I../gmock/include -I../gtest -I../gtest/include -c ../gmock/src/gmock-all.cc && ar -rv libgmock.a gmock-all.o && ranlib libgmock.a
  71 -    INSTALL_COMMAND ""
  72 -    DEPENDS gtest
  73 -)
  74 -
  75 -ExternalProject_add(
  76 -    openssl
  77 -    PREFIX ${EXTERNAL_PREFIX}
  78 -    URL "${kinetic_cpp_client_SOURCE_DIR}/tarballs/openssl-1.0.1g.tar.gz"
  79 -    URL_MD5 "de62b43dfcd858e66a74bee1c834e959"
  80 -    BUILD_IN_SOURCE 1
  81 -    CONFIGURE_COMMAND ${OPENSSL_CONFIGURE_COMMAND} --prefix=${EXTERNAL_PREFIX} ${BUILD_PIC_COMPILER_FLAG}
  82 -    BUILD_COMMAND touch apps/openssl && touch openssl.pc && make ${CHILD_MAKE_FLAGS} build_libs libssl.pc libcrypto.pc
  83 -    INSTALL_COMMAND make install_sw
  84 -)
  85 -
  86 -# The protobuf build requires the existence of a protoc binary that can be
  87 -# executed on the host machine. To handle cross compilation, we always build
  88 -# protobuf once for the host so that we have a suitable copy of protoc.
  89 -ExternalProject_add(
  90 -    protoc
  91 -    PREFIX ${EXTERNAL_PREFIX}/host
  92 -    URL "${kinetic_cpp_client_SOURCE_DIR}/tarballs/protobuf-2.5.0.tar.bz2"
  93 -    URL_MD5 "a72001a9067a4c2c4e0e836d0f92ece4"
  94 -    CONFIGURE_COMMAND ../protoc/configure --prefix=${EXTERNAL_PREFIX}/host --enable-static
  95 -)
  96 -
  97 +#add_library(gmock STATIC /usr/src/gmock/src/gmock-all.cc)
  98  # Protobuf code generation rules
  99 -set(PROTOC_PATH "${PREFIX}/host/bin/protoc")
 100 -set(PROTO_DIR "${CMAKE_BINARY_DIR}/vendor/src/kinetic-proto")
 101 +set(PROTOC_PATH "protoc")
 102 +set(PROTO_DIR "/usr/share/kinetic-protocol")
 103  set(PROTO_ORIG_PATH "${PROTO_DIR}/kinetic.proto")
 104 -set(PROTO_MODIFIED_PATH "${PROTO_DIR}/kinetic_client.proto")
 105 -ExternalProject_add(
 106 -    protobuf
 107 -    PREFIX ${EXTERNAL_PREFIX}
 108 -    URL "${kinetic_cpp_client_SOURCE_DIR}/tarballs/protobuf-2.5.0.tar.bz2"
 109 -    URL_MD5 "a72001a9067a4c2c4e0e836d0f92ece4"
 110 -    CONFIGURE_COMMAND ../protobuf/configure --prefix=${EXTERNAL_PREFIX} --enable-static --with-protoc=${PROTOC_PATH} ${CONFIG_HOST_FLAG} ${CHILD_MAKE_FLAGS} ${PIC_MAKE_FLAGS}
 111 -    DEPENDS protoc
 112 -)
 113 +set(PROTO_MODIFIED_PATH "${CMAKE_BINARY_DIR}/kinetic_client.proto")
 114
 115  add_custom_command(
 116      COMMENT "Compiling protobuf"
 117      OUTPUT ${GENERATED_SOURCES_PATH}/kinetic_client.pb.h ${GENERATED_SOURCES_PATH}/kinetic_client.pb.cc
 118 -    COMMAND mkdir -p ${GENERATED_SOURCES_PATH} && sed 's/com\\.seagate\\.kinetic\\.proto/com.seagate.kinetic.client.proto/' ${PROTO_ORIG_PATH} > ${PROTO_MODIFIED_PATH} && ${PROTOC_PATH} -I=${PROTO_DIR} --cpp_out=${GENERATED_SOURCES_PATH} ${PROTO_MODIFIED_PATH}
 119 -    DEPENDS kinetic-proto protoc protobuf
 120 +    COMMAND mkdir -p ${GENERATED_SOURCES_PATH} && sed 's/com\\.seagate\\.kinetic\\.proto/com.seagate.kinetic.client.proto/' ${PROTO_ORIG_PATH} > ${PROTO_MODIFIED_PATH} && ${PROTOC_PATH} -I=${CMAKE_BINARY_DIR} --cpp_out=${GENERATED_SOURCES_PATH} ${PROTO_MODIFIED_PATH}
 121  )
 122  set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES ${GENERATED_SOURCES_PATH})
 123
 124 @@ -158,20 +76,14 @@
 125      src/test/mock
 126      src/test
 127
 128 -    ${EXTERNAL_PREFIX}/include
 129 -    ${EXTERNAL_PREFIX}/src/gmock/include
 130 -    ${EXTERNAL_PREFIX}/src/gtest/include
 131  )
 132
 133  set(LIBRARY_DEPENDENCIES
 134      kinetic_client
 135 -    ${CMAKE_BINARY_DIR}/vendor/lib/libglog.a
 136 -    ${CMAKE_BINARY_DIR}/vendor/lib/libgflags.a
 137 -    ${CMAKE_BINARY_DIR}/vendor/lib/libssl.a
 138 -    ${CMAKE_BINARY_DIR}/vendor/lib/libcrypto.a
 139 -    ${CMAKE_BINARY_DIR}/vendor/lib/libprotobuf.a
 140 -    ${CMAKE_BINARY_DIR}/vendor/src/gtest/libgtest.a
 141 -    ${CMAKE_BINARY_DIR}/vendor/src/gmock/libgmock.a
 142 +    glog
 143 +    ssl
 144 +    crypto
 145 +    protobuf
 146      ${CMAKE_THREAD_LIBS_INIT}
 147      dl
 148  )
 149 @@ -127,7 +127,7 @@
 150      src/test/message_stream_test.cc
 151      src/test/string_value_test.cc
 152  )
 153 -target_link_libraries(${TEST_BINARY} ${LIBRARY_DEPENDENCIES})
 154 +target_link_libraries(${TEST_BINARY} ${LIBRARY_DEPENDENCIES} gflags gmock gtest)
 155
 156  add_executable(${INTEGRATION_TEST_BINARY}
 157      src/integration_test/delete_test.cc
 158 @@ -137,7 +137,7 @@
 159      src/integration_test/blocking_smoketest.cc
 160      src/test/kinetic_cpp_client_test.cc
 161  )
 162 -target_link_libraries(${INTEGRATION_TEST_BINARY} ${LIBRARY_DEPENDENCIES})
 163 +target_link_libraries(${INTEGRATION_TEST_BINARY} ${LIBRARY_DEPENDENCIES} gflags gmock gtest)
 164
 165  # Rule for running unit tests
 166  add_custom_target(check
 167 --- kinetic-cpp-client-0.1.1/src/test/kinetic_cpp_client_test.cc.orig   2014-09-18 02:14:04.000000000 +0200
 168 +++ kinetic-cpp-client-0.1.1/src/test/kinetic_cpp_client_test.cc        2015-02-08 17:07:59.844379055 +0100
 169 @@ -41,6 +41,6 @@
 170      int status = RUN_ALL_TESTS();
 171      google::protobuf::ShutdownProtobufLibrary();
 172      google::ShutdownGoogleLogging();
 173 -    google::ShutDownCommandLineFlags();
 174 +    gflags::ShutDownCommandLineFlags();
 175      return status;
 176  }