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

--- ceph-0.51/src/Makefile.am.orig	2012-08-26 00:58:03.000000000 +0200
+++ ceph-0.51/src/Makefile.am	2012-09-10 18:52:40.813987974 +0200
@@ -53,7 +53,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
 
@@ -137,7 +137,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
@@ -268,7 +268,7 @@
 libcephfs_la_CFLAGS= ${CRYPTO_CFLAGS} ${AM_CFLAGS}
 libcephfs_la_CXXFLAGS= ${CRYPTO_CXXFLAGS} ${AM_CXXFLAGS}
 libcephfs_la_LIBADD = libosdc.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
 
@@ -293,7 +293,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
Commit	Line	Data
041b9abb PS	1	--- ceph-0.51/src/Makefile.am.orig 2012-08-26 00:58:03.000000000 +0200
	2	+++ ceph-0.51/src/Makefile.am 2012-09-10 18:52:40.813987974 +0200
	3	@@ -53,7 +53,7 @@
	4	EXTRALIBS += -lprofiler
	5	endif
	6
	7	-LIBGLOBAL_LDA = libglobal.la $(PTHREAD_LIBS) -lm $(CRYPTO_LIBS) $(EXTRALIBS)
	8	+LIBGLOBAL_LDA = libglobal.la $(PTHREAD_LIBS) -lm $(CRYPTO_LIBS) $(EXTRALIBS) -lboost_system
	9
	10	LIBOS_LDA = libos.a
	11
	12	@@ -137,7 +137,7 @@
2a1a6301 JR	13	bin_PROGRAMS += cephfs
	14
	15	librados_config_SOURCES = librados-config.cc
	16	-librados_config_LDADD = libglobal.la librados.la $(EXTRALIBS) $(CRYPTO_LIBS)
041b9abb	17	+librados_config_LDADD = librados.la $(LIBGLOBAL_LDA) $(EXTRALIBS) $(CRYPTO_LIBS)
2a1a6301 JR	18	bin_PROGRAMS += librados-config
	19
	20	# synthetic client
d7e6592a PS	21	@@ -268,7 +268,7 @@
	22	libcephfs_la_CFLAGS= ${CRYPTO_CFLAGS} ${AM_CFLAGS}
	23	libcephfs_la_CXXFLAGS= ${CRYPTO_CXXFLAGS} ${AM_CXXFLAGS}
	24	libcephfs_la_LIBADD = libosdc.la
	25	-libcephfs_la_LDFLAGS = $(PTHREAD_LIBS) $(CRYPTO_LIBS) $(EXTRALIBS) \
	26	+libcephfs_la_LDFLAGS = $(PTHREAD_LIBS) $(CRYPTO_LIBS) $(EXTRALIBS) -lboost_system \
	27	${AM_LDFLAGS} -version-info 1:0:0 -export-symbols-regex '^ceph_.*'
	28	lib_LTLIBRARIES += libcephfs.la
	29
041b9abb PS	30	@@ -293,7 +293,7 @@
	31	librados_la_SOURCES = ${librados_SOURCES}
	32	librados_la_CFLAGS = ${CRYPTO_CFLAGS} ${AM_CFLAGS}
	33	librados_la_CXXFLAGS = ${CRYPTO_CXXFLAGS} ${AM_CXXFLAGS}
	34	-librados_la_LIBADD = libcommon.la $(PTHREAD_LIBS) $(CRYPTO_LIBS) $(EXTRALIBS)
	35	+librados_la_LIBADD = libcommon.la $(PTHREAD_LIBS) $(CRYPTO_LIBS) $(EXTRALIBS) -lboost_system
	36	librados_la_LDFLAGS = ${AM_LDFLAGS} -version-info 2:0:0 -export-symbols-regex '^rados_.*'
	37	lib_LTLIBRARIES += librados.la
	38