- rel 2; fix build with new boost

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

diff --git a/ceph-link.patch b/ceph-link.patch
index 203346e3979e2d0fabf4d03d2c80e242588abe19..948fb63c6bfb32e386077a326752d8cd7cc70e23 100644 (file)
--- a/ceph-link.patch
+++ b/ceph-link.patch
@@ -1,38 +1,11 @@
---- ceph-0.55.1/src/Makefile.am.orig   2012-12-13 01:22:18.000000000 +0100
-+++ ceph-0.55.1/src/Makefile.am        2012-12-15 15:24:44.676015542 +0100
-@@ -54,7 +54,7 @@
- EXTRALIBS += -lprofiler
- endif
- 
--LIBGLOBAL_LDA = libglobal.la $(PTHREAD_LIBS) -lm $(CRYPTO_LIBS) $(EXTRALIBS)
-+LIBGLOBAL_LDA = libglobal.la $(PTHREAD_LIBS) -lm $(CRYPTO_LIBS) $(EXTRALIBS) -lboost_system
- 
- LIBOS_LDA = libos.a
- 
-@@ -139,7 +139,7 @@
- bin_PROGRAMS += cephfs
- 
- librados_config_SOURCES = librados-config.cc
--librados_config_LDADD = libglobal.la librados.la $(EXTRALIBS) $(CRYPTO_LIBS)
-+librados_config_LDADD = librados.la $(LIBGLOBAL_LDA) $(EXTRALIBS) $(CRYPTO_LIBS)
- bin_PROGRAMS += librados-config
- 
- # synthetic client
-@@ -295,7 +295,7 @@
- libcephfs_la_CFLAGS= ${CRYPTO_CFLAGS} ${AM_CFLAGS}
- libcephfs_la_CXXFLAGS= ${CRYPTO_CXXFLAGS} ${AM_CXXFLAGS}
- libcephfs_la_LIBADD = libclient.la
--libcephfs_la_LDFLAGS =  $(PTHREAD_LIBS) $(CRYPTO_LIBS) $(EXTRALIBS) \
-+libcephfs_la_LDFLAGS =  $(PTHREAD_LIBS) $(CRYPTO_LIBS) $(EXTRALIBS) -lboost_system \
-             ${AM_LDFLAGS} -version-info 1:0:0 -export-symbols-regex '^ceph_.*'
- lib_LTLIBRARIES += libcephfs.la
- 
-@@ -317,7 +317,7 @@
- librados_la_SOURCES = ${librados_SOURCES}
- librados_la_CFLAGS = ${CRYPTO_CFLAGS} ${AM_CFLAGS}
- librados_la_CXXFLAGS = ${CRYPTO_CXXFLAGS} ${AM_CXXFLAGS}
--librados_la_LIBADD = libcommon.la $(PTHREAD_LIBS) $(CRYPTO_LIBS) $(EXTRALIBS)
-+librados_la_LIBADD = libcommon.la $(PTHREAD_LIBS) $(CRYPTO_LIBS) $(EXTRALIBS) -lboost_system
- librados_la_LDFLAGS = ${AM_LDFLAGS} -version-info 2:0:0 -export-symbols-regex '^rados_.*'
- lib_LTLIBRARIES += librados.la
- 
+--- 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}
+ 
+-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