ceph-link.patch

   1 --- ceph-10.2.11/configure.ac.orig      2018-07-09 18:23:56.000000000 +0200
   2 +++ ceph-10.2.11/configure.ac   2020-05-22 21:04:23.958900423 +0200
   3 @@ -760,12 +760,12 @@
   4
   5  if test "x$enable_xio" = x"yes"; then
   6     AC_CHECK_HEADER([libxio.h], [], AC_MSG_ERROR([Cannot find header 'libxio.h'.]))
   7 -   AC_CHECK_LIB([xio], [xio_init], [], AC_MSG_FAILURE([Accelio libxio not found]))
   8 -   AC_CHECK_LIB([ibverbs], [ibv_query_device], [], AC_MSG_FAILURE([libibverbs not found]))
   9 -   AC_CHECK_LIB([rdmacm], [rdma_connect], [], AC_MSG_FAILURE([librdmacm not found]))
  10 +   AC_CHECK_LIB([xio], [xio_init], [true], AC_MSG_FAILURE([Accelio libxio not found]))
  11 +   AC_CHECK_LIB([ibverbs], [ibv_query_device], [true], AC_MSG_FAILURE([libibverbs not found]))
  12 +   AC_CHECK_LIB([rdmacm], [rdma_connect], [true], AC_MSG_FAILURE([librdmacm not found]))
  13
  14     # Also require boost-regex, used in address_helper
  15 -   AC_CHECK_LIB(boost_regex, main, [],
  16 +   AC_CHECK_LIB(boost_regex, main, [true],
  17        AC_MSG_FAILURE(["Boost regex library not found."]))
  18
  19     AC_DEFINE([HAVE_XIO], [1], [Accelio conditional compilation])
  20 @@ -874,7 +874,7 @@
  21  AS_IF([test "x$with_librocksdb" = "xyes"],
  22              [PKG_CHECK_MODULES([LIBROCKSDB], [rocksdb], [], [true])])
  23  AS_IF([test "x$with_librocksdb" = "xyes"],
  24 -            [AC_CHECK_LIB([rocksdb], [open], [], [AC_MSG_FAILURE([librocksdb not found])])])
  25 +            [AC_CHECK_LIB([rocksdb], [open], [true], [AC_MSG_FAILURE([librocksdb not found])])])
  26  AM_CONDITIONAL(WITH_DLIBROCKSDB, [ test "$with_librocksdb" = "yes" ])
  27
  28  AC_ARG_WITH([librocksdb-static],
  29 @@ -897,8 +897,8 @@
  30
  31  # needs libcurl and libxml2
  32  if test "x$with_rest_bench" = xyes && test "x$with_system_libs3" = xno; then
  33 -   AC_CHECK_LIB([curl], [curl_easy_init], [], AC_MSG_ERROR([libcurl not found]))
  34 -   AC_CHECK_LIB([xml2], [xmlParseChunk], [], AC_MSG_ERROR([libxml2 not found]))
  35 +   AC_CHECK_LIB([curl], [curl_easy_init], [true], AC_MSG_ERROR([libcurl not found]))
  36 +   AC_CHECK_LIB([xml2], [xmlParseChunk], [true], AC_MSG_ERROR([libxml2 not found]))
  37  fi
  38
  39  # use libaio?
  40 --- ceph-10.2.11/src/kv/Makefile.am.orig        2018-07-09 18:23:56.000000000 +0200
  41 +++ ceph-10.2.11/src/kv/Makefile.am     2020-05-22 21:08:20.037621475 +0200
  42 @@ -1,12 +1,12 @@
  43  if ENABLE_SERVER
  44
  45 -libkv_a_SOURCES = \
  46 +libkv_la_SOURCES = \
  47         kv/KeyValueDB.cc \
  48         kv/LevelDBStore.cc
  49 -libkv_a_CXXFLAGS = ${AM_CXXFLAGS}
  50 -libkv_a_LIBADD =
  51 +libkv_la_CXXFLAGS = ${AM_CXXFLAGS}
  52 +libkv_la_LIBADD =
  53
  54 -noinst_LIBRARIES += libkv.a
  55 +noinst_LTLIBRARIES += libkv.la
  56
  57  noinst_HEADERS += \
  58         kv/KeyValueDB.h \
  59 @@ -29,22 +29,22 @@
  60
  61  rocksdb/librocksdb.a:
  62         cd rocksdb && $(ROCKSDB_MAKE_VARS) $(MAKE) -j$(shell ${NPROC}) static_lib
  63 -libkv_a_CXXFLAGS += -I rocksdb/include -fPIC
  64 -libkv_a_SOURCES += kv/RocksDBStore.cc
  65 -libkv_a_LIBADD += rocksdb/librocksdb.a
  66 +libkv_la_CXXFLAGS += -I rocksdb/include -fPIC
  67 +libkv_la_SOURCES += kv/RocksDBStore.cc
  68 +libkv_la_LIBADD += rocksdb/librocksdb.a
  69  noinst_HEADERS += kv/RocksDBStore.h
  70  endif
  71
  72  if WITH_DLIBROCKSDB
  73 -libkv_a_SOURCES += kv/RocksDBStore.cc
  74 -libkv_a_LIBADD += -lrocksdb
  75 +libkv_la_SOURCES += kv/RocksDBStore.cc
  76 +libkv_la_LIBADD += -lrocksdb
  77  noinst_HEADERS += kv/RocksDBStore.h
  78  endif
  79
  80  if WITH_KINETIC
  81 -libkv_a_SOURCES += kv/KineticStore.cc
  82 -libkv_a_CXXFLAGS += -std=gnu++11
  83 -libkv_a_LIBADD += -lkinetic_client -lprotobuf -lglog -lgflags libcrypto.a
  84 +libkv_la_SOURCES += kv/KineticStore.cc
  85 +libkv_la_CXXFLAGS += -std=gnu++11
  86 +libkv_la_LIBADD += -lkinetic_client -lprotobuf -lglog -lgflags libcrypto.a
  87  noinst_HEADERS += kv/KineticStore.h
  88  endif
  89
  90 --- ceph-10.2.11/src/os/Makefile.am.orig        2018-07-09 18:23:56.000000000 +0200
  91 +++ ceph-10.2.11/src/os/Makefile.am     2020-05-22 21:11:02.663407123 +0200
  92 @@ -12,7 +12,7 @@
  93
  94  if ENABLE_SERVER
  95
  96 -libos_a_SOURCES = \
  97 +libos_la_SOURCES = \
  98         os/filestore/chain_xattr.cc \
  99         os/filestore/DBObjectMap.cc \
 100         os/filestore/FileJournal.cc \
 101 @@ -31,11 +31,11 @@
 102         os/ObjectStore.cc
 103
 104  if WITH_FUSE
 105 -libos_a_SOURCES += os/FuseStore.cc
 106 +libos_la_SOURCES += os/FuseStore.cc
 107  endif
 108
 109  if WITH_LIBAIO
 110 -libos_a_SOURCES += \
 111 +libos_la_SOURCES += \
 112         os/bluestore/kv.cc \
 113         os/bluestore/Allocator.cc \
 114         os/bluestore/BlockDevice.cc \
 115 @@ -48,25 +48,25 @@
 116  endif
 117
 118  if LINUX
 119 -libos_a_SOURCES += os/filestore/BtrfsFileStoreBackend.cc
 120 +libos_la_SOURCES += os/filestore/BtrfsFileStoreBackend.cc
 121  endif
 122
 123  if WITH_LIBXFS
 124 -libos_a_SOURCES += \
 125 +libos_la_SOURCES += \
 126      os/filestore/XfsFileStoreBackend.cc \
 127      os/fs/XFS.cc
 128  endif
 129
 130  if WITH_LIBZFS
 131 -libos_a_SOURCES += os/filestore/ZFSFileStoreBackend.cc
 132 +libos_la_SOURCES += os/filestore/ZFSFileStoreBackend.cc
 133  endif
 134
 135 -libos_a_CXXFLAGS = ${AM_CXXFLAGS} -I rocksdb/include -fPIC
 136 -libos_a_LIBADD = libos_types.a libkv.a
 137 -noinst_LIBRARIES += libos.a
 138 +libos_la_CXXFLAGS = ${AM_CXXFLAGS} -I rocksdb/include -fPIC
 139 +libos_la_LIBADD = libos_types.a libkv.la
 140 +noinst_LTLIBRARIES += libos.la
 141
 142  if WITH_LTTNG
 143 -libos_a_LIBADD += $(LIBOS_TP)
 144 +libos_la_LIBADD += $(LIBOS_TP)
 145  endif
 146
 147  noinst_HEADERS += \
 148 @@ -140,11 +140,11 @@
 149         ${top_srcdir}/src/spdk/lib/util/libspdk_util.a \
 150         ${top_srcdir}/src/spdk/lib/ioat/libspdk_ioat.a
 151
 152 -libos_a_CXXFLAGS += \
 153 +libos_la_CXXFLAGS += \
 154         ${LIBSPDK_CFLAGS} \
 155         ${LIBDPDK_CFLAGS} \
 156         ${LIBPCIACCESS_CFLAGS}
 157 -libos_a_SOURCES += os/bluestore/NVMEDevice.cc
 158 +libos_la_SOURCES += os/bluestore/NVMEDevice.cc
 159  noinst_HEADERS += os/bluestore/NVMEDevice.h
 160  endif
 161
 162 --- ceph-10.2.11/src/Makefile-env.am.orig       2018-07-09 18:23:56.000000000 +0200
 163 +++ ceph-10.2.11/src/Makefile-env.am    2020-05-22 21:11:33.779905217 +0200
 164 @@ -203,9 +203,9 @@
 165  LIBCRUSH = libcrush.la
 166  LIBCOMPRESSOR = libcompressor.la
 167  LIBJSON_SPIRIT = libjson_spirit.la
 168 -LIBKV = libkv.a
 169 +LIBKV = libkv.la
 170  LIBLOG = liblog.la
 171 -LIBOS = libos.a
 172 +LIBOS = libos.la
 173  LIBOS_TYPES = libos_types.a
 174  LIBOSD = libosd.a
 175  LIBOSD_TYPES = libosd_types.la