- rel 2; fix build with new boost

[packages/ceph.git] / ceph-link.patch

diff --git a/ceph-link.patch b/ceph-link.patch
index c2c41328108030332849bf985abd3590cbcec457..948fb63c6bfb32e386077a326752d8cd7cc70e23 100644 (file)
--- a/ceph-link.patch
+++ b/ceph-link.patch
@@ -1,11 +1,11 @@
---- ceph-0.41/src/Makefile.am~ 2012-01-27 21:35:39.000000000 +0100
-+++ ceph-0.41/src/Makefile.am  2012-02-23 09:55:11.768753394 +0100
-@@ -116,7 +116,7 @@
- bin_PROGRAMS += cephfs
+--- ceph-0.92/src/libradosstriper/Makefile.am.orig     2015-02-02 22:32:32.000000000 +0100
++++ ceph-0.92/src/libradosstriper/Makefile.am  2015-02-07 18:25:15.007810402 +0100
+@@ -6,7 +6,7 @@
+ # We need this to avoid basename conflicts with the libradosstriper build tests in test/Makefile.am
+ libradosstriper_la_CXXFLAGS = ${AM_CXXFLAGS}
  
- librados_config_SOURCES = librados-config.cc
--librados_config_LDADD = libglobal.la librados.la $(EXTRALIBS) $(CRYPTO_LIBS)
-+librados_config_LDADD = $(LIBGLOBAL_LDA) librados.la $(EXTRALIBS) $(CRYPTO_LIBS)
- bin_PROGRAMS += librados-config
- 
- # synthetic client
+-LIBRADOSSTRIPER_DEPS = $(LIBRADOS_DEPS)
++LIBRADOSSTRIPER_DEPS = $(top_builddir)/src/librados.la $(LIBRADOS_DEPS)
+ libradosstriper_la_LIBADD = $(LIBRADOSSTRIPER_DEPS)
+ libradosstriper_la_LDFLAGS = ${AM_LDFLAGS} -version-info 1:0:0
+ if LINUX