From 16694e0d72499de1a951bf89e15e5204f87d5dae Mon Sep 17 00:00:00 2001 From: "Kacper Kowalik (Xarthisius)" Date: Wed, 3 Nov 2010 12:19:32 +0100 Subject: [sys-cluster/ceph] Version bump. Thanks to Marcin Mirosław for the report. Drop old. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sys-cluster/ceph/ChangeLog | 8 + sys-cluster/ceph/Manifest | 8 +- sys-cluster/ceph/ceph-0.22-r1.ebuild | 68 ------ sys-cluster/ceph/ceph-0.22.2.ebuild | 69 +++++++ sys-cluster/ceph/files/ceph-0.22-asneeded.patch | 233 --------------------- sys-cluster/ceph/files/ceph-0.22.2-asneeded.patch | 241 ++++++++++++++++++++++ 6 files changed, 322 insertions(+), 305 deletions(-) delete mode 100644 sys-cluster/ceph/ceph-0.22-r1.ebuild create mode 100644 sys-cluster/ceph/ceph-0.22.2.ebuild delete mode 100644 sys-cluster/ceph/files/ceph-0.22-asneeded.patch create mode 100644 sys-cluster/ceph/files/ceph-0.22.2-asneeded.patch (limited to 'sys-cluster') diff --git a/sys-cluster/ceph/ChangeLog b/sys-cluster/ceph/ChangeLog index 62ae8eb67..55a83ed54 100644 --- a/sys-cluster/ceph/ChangeLog +++ b/sys-cluster/ceph/ChangeLog @@ -2,6 +2,14 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header$ +*ceph-0.22.2 (03 Nov 2010) + + 03 Nov 2010; Kacper Kowalik -ceph-0.22-r1.ebuild, + +ceph-0.22.2.ebuild, +files/ceph-0.22.2-asneeded.patch, + -files/ceph-0.22-asneeded.patch: + Version bump. Thanks to Marcin Mirosław for the report. + Drop old. + *ceph-0.22-r1 (03 Nov 2010) 03 Nov 2010; Kacper Kowalik -ceph-0.22.ebuild, diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest index 16df5b42d..bb52dfb0d 100644 --- a/sys-cluster/ceph/Manifest +++ b/sys-cluster/ceph/Manifest @@ -1,7 +1,7 @@ -AUX ceph-0.22-asneeded.patch 8905 RMD160 becfac435aad2dedc775bf0831e407aa2d78a49b SHA1 6e2bc81acfcba661dcdb86ce8799858b57ddecdc SHA256 bc1c0fbf52f69fb548475e297fdf22b2d2726795db7e670578ace90e824d71af +AUX ceph-0.22.2-asneeded.patch 9286 RMD160 5ac1ecf18ca46ecec39a884b9105e9ce53c6b59c SHA1 065c3f0718ea39a53c6bae393815d99da78f37bc SHA256 f3a731e108e3f6b7ce25a9a2530615b4efe5871ee4f6e756d3d2201744556b68 AUX ceph.confd 225 RMD160 9842eeb3f55453dc6ab96ebb0c4f784c56e5b9d3 SHA1 63e1670ab13e0a957da93d9ad6a17b612219bd88 SHA256 b12f53878a92b5ee70f9d827e321b641618bd267a7fa57a1e53f0ee4d5c830e8 AUX ceph.initd 400 RMD160 58873ca15a29a81ecd64bda17749eee1ca96af01 SHA1 544beae2d460fa0a44eb4e9eb26a7bbcd96405d7 SHA256 9b957c42c3ab27e3e29f42aaae718396e14cd91256df7f959e212446d2f90618 -DIST ceph-0.22.tar.gz 1384045 RMD160 525d502985f64ac2fbd794baca42ae74766b99d6 SHA1 4f679f5dee28ac963b453d87324b67df124c91c6 SHA256 11c3203a9c80467b4ea9ab6b41f739d3f5c25dda1650c9cbaa366dd984f4bd40 -EBUILD ceph-0.22-r1.ebuild 1624 RMD160 f588c51348fca2a4f2ff837baf28704007865fa7 SHA1 4645fc8f34a2c99009ed7aee9b236d4ff4c51a98 SHA256 927d86111680234ec0b6d6709e9b58c4f860d7eb9e8da7b0a7d9fa73b9bd0ac3 -MISC ChangeLog 1114 RMD160 6264cd5e379b2c53973125b2082ccd005ba7a859 SHA1 ce83e508f0bbd95fffa240159dcb3758ac591a22 SHA256 aca3da9896149145aad390ff4f76c0d5db1ec3bc018ad0113d6673a7ca046a36 +DIST ceph-0.22.2.tar.gz 1388382 RMD160 3d7f63347c5b486e7a5509a3c316016272d744cd SHA1 4c0490b023dc37f243e5c225f9fcfb77fe36d676 SHA256 9a8dc82bab9b8cbc3b22a9907514cca0b8c475fb5fec748dff9443417b777849 +EBUILD ceph-0.22.2.ebuild 1684 RMD160 e428cbab6b0429db80175915b3ce731f2f894a5b SHA1 4634cda6471a0d2ecfa480fbc571af73c553adb4 SHA256 e5e7a14016252046ba7bd6671728b0a63f1b586ba6710da8779a38fb6d4dfb36 +MISC ChangeLog 1398 RMD160 0ae20b1e5406a422ee180b17ac0e33f25abc87b0 SHA1 dfb157c2f49a16134d5547b10a74ece78b1c15f9 SHA256 eb7b8dad8c2f9c593b9914e2ecad44233a900bf7866b29d95efe4481c6fb6e25 MISC metadata.xml 500 RMD160 8f9c763bbdc181f3137b7ec9072045704a7dbde4 SHA1 79483cf0de883a911745b2152b1b78ff64dcaa37 SHA256 98ecd9596f86ca204850d8c673a93f34c99e7a3eb6f55dbdf5ce56b9164d4407 diff --git a/sys-cluster/ceph/ceph-0.22-r1.ebuild b/sys-cluster/ceph/ceph-0.22-r1.ebuild deleted file mode 100644 index 71bb1616e..000000000 --- a/sys-cluster/ceph/ceph-0.22-r1.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="3" - -inherit autotools eutils multilib - -DESCRIPTION="Ceph distributed filesystem" -HOMEPAGE="http://ceph.newdream.net/" -SRC_URI="http://ceph.newdream.net/download/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug fuse libatomic radosgw static-libs" - -CDEPEND="dev-libs/boost - dev-libs/libedit - dev-libs/openssl - libatomic? ( dev-libs/libatomic_ops ) - fuse? ( sys-fs/fuse ) - radosgw? ( dev-libs/fcgi dev-libs/expat )" -DEPEND="${CDEPEND} - dev-util/pkgconfig" -RDEPEND="${CDEPEND} - sys-fs/btrfs-progs" - -src_prepare() { - sed -e 's:invoke-rc\.d.*:/etc/init.d/ceph reload >/dev/null:' \ - -i src/logrotate.conf || die - epatch "${FILESDIR}"/${P}-asneeded.patch - eautoreconf -} - -src_configure() { - econf \ - --without-hadoop \ - --docdir=/usr/share/doc/${PF} \ - $(use_with debug) \ - $(use_with fuse) \ - $(use_with libatomic libatomic-ops) \ - $(use_with radosgw) \ - $(use_enable static-libs static) -} - -src_install() { - emake DESTDIR="${D}" install || die - find "${D}" -type f -name "*.la" -exec rm -f {} \; - - rmdir "${D}/usr/sbin" - - exeinto /usr/$(get_libdir)/ceph || die - newexe src/init-ceph ceph_init.sh || die - - insinto /etc/logrotate.d/ || die - newins src/logrotate.conf ${PN} || die - - chmod 644 "${D}"/usr/share/doc/${PF}/sample.* || die - - keepdir /var/lib/${PN} || die - keepdir /var/lib/${PN}/tmp || die - keepdir /var/log/${PN}/stat || die - keepdir /var/run/${PN} || die - - newinitd "${FILESDIR}/${PN}.initd" ${PN} || die - newconfd "${FILESDIR}/${PN}.confd" ${PN} || die -} diff --git a/sys-cluster/ceph/ceph-0.22.2.ebuild b/sys-cluster/ceph/ceph-0.22.2.ebuild new file mode 100644 index 000000000..e7943b63a --- /dev/null +++ b/sys-cluster/ceph/ceph-0.22.2.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="3" + +inherit autotools eutils multilib + +DESCRIPTION="Ceph distributed filesystem" +HOMEPAGE="http://ceph.newdream.net/" +SRC_URI="http://ceph.newdream.net/download/${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="debug fuse libatomic radosgw static-libs" + +CDEPEND="dev-libs/boost + dev-libs/libedit + dev-libs/openssl + libatomic? ( dev-libs/libatomic_ops ) + fuse? ( sys-fs/fuse ) + radosgw? ( dev-libs/fcgi dev-libs/expat )" +DEPEND="${CDEPEND} + dev-util/pkgconfig" +RDEPEND="${CDEPEND} + sys-fs/btrfs-progs" + +src_prepare() { + sed -e 's:invoke-rc\.d.*:/etc/init.d/ceph reload >/dev/null:' \ + -i src/logrotate.conf || die + epatch "${FILESDIR}"/${P}-asneeded.patch + sed -i "/^docdir =/d" src/Makefile.am || die #fix doc path + eautoreconf +} + +src_configure() { + econf \ + --without-hadoop \ + --docdir=/usr/share/doc/${PF} \ + $(use_with debug) \ + $(use_with fuse) \ + $(use_with libatomic libatomic-ops) \ + $(use_with radosgw) \ + $(use_enable static-libs static) +} + +src_install() { + emake DESTDIR="${D}" install || die + find "${D}" -type f -name "*.la" -exec rm -f {} \; + + rmdir "${D}/usr/sbin" + + exeinto /usr/$(get_libdir)/ceph || die + newexe src/init-ceph ceph_init.sh || die + + insinto /etc/logrotate.d/ || die + newins src/logrotate.conf ${PN} || die + + chmod 644 "${D}"/usr/share/doc/${PF}/sample.* || die + + keepdir /var/lib/${PN} || die + keepdir /var/lib/${PN}/tmp || die + keepdir /var/log/${PN}/stat || die + keepdir /var/run/${PN} || die + + newinitd "${FILESDIR}/${PN}.initd" ${PN} || die + newconfd "${FILESDIR}/${PN}.confd" ${PN} || die +} diff --git a/sys-cluster/ceph/files/ceph-0.22-asneeded.patch b/sys-cluster/ceph/files/ceph-0.22-asneeded.patch deleted file mode 100644 index 326af7672..000000000 --- a/sys-cluster/ceph/files/ceph-0.22-asneeded.patch +++ /dev/null @@ -1,233 +0,0 @@ -Fix build with as-needed - ---- ceph-0.22/configure.ac -+++ ceph-0.22/configure.ac -@@ -160,6 +160,7 @@ - AC_CHECK_HEADER([openssl/md5.h], - [], - [AC_MSG_ERROR([Sorry you need openssl dev files (libssl-dev on debian)])]) -+PKG_CHECK_MODULES([OPENSSL], [openssl]) - - AC_CHECK_HEADERS([sys/xattr.h arpa/inet.h netdb.h netinet/in.h sys/file.h sys/ioctl.h sys/mount.h sys/param.h sys/socket.h sys/statvfs.h sys/time.h sys/vfs.h syslog.h utime.h]) - ---- ceph-0.22/src/Makefile.am -+++ ceph-0.22/src/Makefile.am -@@ -10,37 +10,37 @@ - - # monitor - cmon_SOURCES = cmon.cc msg/SimpleMessenger.cc --cmon_LDADD = libmon.a libcrush.a libcommon.a -lpthread -lm -lcrypto -+cmon_LDADD = libmon.a libcrush.a libcommon.a -lpthread -lm $(OPENSSL_LIBS) - bin_PROGRAMS += cmon - - # osd - cosd_SOURCES = cosd.cc msg/SimpleMessenger.cc objclass/class_debug.cc \ - objclass/class_api.cc --cosd_LDADD = libosd.a libos.a libcrush.a libcommon.a -ldl -lpthread -lm -lcrypto -+cosd_LDADD = libosd.a libos.a libcrush.a libcommon.a -ldl -lpthread -lm $(OPENSSL_LIBS) - bin_PROGRAMS += cosd - cosd_CXXFLAGS = ${AM_CFLAGS} - - # mds - cmds_SOURCES = cmds.cc msg/SimpleMessenger.cc --cmds_LDADD = libmds.a libosdc.a libcrush.a libcommon.a -lpthread -lm -lcrypto -+cmds_LDADD = libmds.a libosdc.a libcrush.a libcommon.a -lpthread -lm $(OPENSSL_LIBS) - bin_PROGRAMS += cmds - cmds_CXXFLAGS = ${AM_CFLAGS} - - # admin tools - ceph_SOURCES = ceph.cc msg/SimpleMessenger.cc --ceph_LDADD = libcrush.a libcommon.a -ledit -lpthread -lm -lcrypto -+ceph_LDADD = libcrush.a libcommon.a -ledit -lpthread -lm $(OPENSSL_LIBS) - cconf_SOURCES = cconf.cc --cconf_LDADD = libcommon.a -lpthread -lm -lcrypto -+cconf_LDADD = libcommon.a -lpthread -lm $(OPENSSL_LIBS) - cauthtool_SOURCES = cauthtool.cc --cauthtool_LDADD = libcommon.a -lpthread -lm -lcrypto -+cauthtool_LDADD = libcommon.a -lpthread -lm $(OPENSSL_LIBS) - bin_PROGRAMS += ceph cconf cauthtool - - monmaptool_SOURCES = monmaptool.cc --monmaptool_LDADD = libcommon.a -lpthread -lm -lcrypto -+monmaptool_LDADD = libcommon.a -lpthread -lm $(OPENSSL_LIBS) - crushtool_SOURCES = crushtool.cc --crushtool_LDADD = libcrush.a libcommon.a -lpthread -lm -lcrypto -+crushtool_LDADD = libcrush.a libcommon.a -lpthread -lm $(OPENSSL_LIBS) - osdmaptool_SOURCES = osdmaptool.cc --osdmaptool_LDADD = libcrush.a libcommon.a -lpthread -lm -lcrypto -+osdmaptool_LDADD = libcrush.a libcommon.a -lpthread -lm $(OPENSSL_LIBS) - bin_PROGRAMS += monmaptool crushtool osdmaptool - - mount_ceph_SOURCES = mount/mount.ceph.c -@@ -48,7 +48,7 @@ - - # synthetic client - csyn_SOURCES = csyn.cc msg/SimpleMessenger.cc --csyn_LDADD = libclient.a libosdc.a libcrush.a libcommon.a -lpthread -lm -lcrypto -+csyn_LDADD = libclient.a libosdc.a libcrush.a libcommon.a -lpthread -lm $(OPENSSL_LIBS) - bin_PROGRAMS += csyn - - core: cmon cosd cmds ceph cconf monmaptool osdmaptool crushtool csyn -@@ -57,7 +57,7 @@ - # fuse targets? - if WITH_FUSE - cfuse_SOURCES = cfuse.cc msg/SimpleMessenger.cc client/fuse.cc client/fuse_ll.cc --cfuse_LDADD = -lfuse libclient.a libosdc.a libcrush.a libcommon.a -lpthread -lm -lcrypto -+cfuse_LDADD = -lfuse libclient.a libosdc.a libcrush.a libcommon.a -lpthread -lm $(OPENSSL_LIBS) - cfuse_CXXFLAGS = ${AM_CFLAGS} - bin_PROGRAMS += cfuse - -@@ -87,26 +87,26 @@ - if WITH_DEBUG - - psim_SOURCES = psim.cc --psim_LDADD = libcrush.a libcommon.a -lpthread -lm -lcrypto -+psim_LDADD = libcrush.a libcommon.a -lpthread -lm $(OPENSSL_LIBS) - bin_PROGRAMS += psim - - testmsgr_SOURCES = testmsgr.cc msg/SimpleMessenger.cc --testmsgr_LDADD = libcommon.a -lpthread -lm -lcrypto -+testmsgr_LDADD = libcommon.a -lpthread -lm $(OPENSSL_LIBS) - bin_PROGRAMS += testmsgr - - test_ioctls_SOURCES = client/test_ioctls.c - bin_PROGRAMS += test_ioctls - - dumpjournal_SOURCES = dumpjournal.cc msg/SimpleMessenger.cc --dumpjournal_LDADD = libosdc.a libcrush.a libcommon.a -lpthread -lm -lcrypto -+dumpjournal_LDADD = libosdc.a libcrush.a libcommon.a -lpthread -lm $(OPENSSL_LIBS) - dupstore_SOURCES = dupstore.cc --dupstore_LDADD = libos.a libcommon.a -lpthread -lm -lcrypto -+dupstore_LDADD = libos.a libcommon.a -lpthread -lm $(OPENSSL_LIBS) - streamtest_SOURCES = streamtest.cc --streamtest_LDADD = libos.a libcommon.a -lpthread -lm -lcrypto -+streamtest_LDADD = libos.a libcommon.a -lpthread -lm $(OPENSSL_LIBS) - bin_PROGRAMS += dumpjournal dupstore streamtest - - test_trans_SOURCES = test_trans.cc --test_trans_LDADD = libos.a libcommon.a -lpthread -lm -lcrypto -+test_trans_LDADD = libos.a libcommon.a -lpthread -lm $(OPENSSL_LIBS) - bin_PROGRAMS += test_trans - - -@@ -130,7 +130,8 @@ - crush/hash.c - libcrush_la_CFLAGS = ${AM_CFLAGS} - libcrush_la_CXXFLAGS = ${AM_CXXFLAGS} --libcrush_la_LDFLAGS = -version-info 1:0:0 -export-symbols-regex 'crush_.*' -lm -+libcrush_la_LDFLAGS = -version-info 1:0:0 -export-symbols-regex 'crush_.*' -+libcrush_la_LIBADD = -lm - lib_LTLIBRARIES += libcrush.la - - # libceph -@@ -141,14 +142,14 @@ - ${libcommon_a_SOURCES} \ - ${libosdc_a_SOURCES} - libceph_la_CFLAGS = ${AM_CFLAGS} - libceph_la_CXXFLAGS= ${AM_CXXFLAGS} --libceph_la_LIBADD = libcrush.la --libceph_la_LDFLAGS = -version-info 1:0:0 -export-symbols-regex '^ceph_.*' -lpthread -lssl -+libceph_la_LIBADD = libcrush.la -lpthread $(OPENSSL_LIBS) -+libceph_la_LDFLAGS = -version-info 1:0:0 -export-symbols-regex '^ceph_.*' - lib_LTLIBRARIES += libceph.la - - if WITH_DEBUG - testceph_SOURCES = client/testceph.cc --testceph_LDADD = libceph.la libcrush.la -lpthread -lm -lcrypto -+testceph_LDADD = libceph.la libcrush.la -lpthread -lm $(OPENSSL_LIBS) - bin_PROGRAMS += testceph - endif - -@@ -160,9 +160,9 @@ - ${libcommon_a_SOURCES} - librados_la_SOURCES = ${librados_SOURCES} - librados_la_CFLAGS = ${AM_CFLAGS} --librados_la_CXXFLAGS = ${AM_CXXFLAGS} --librados_la_LIBADD = libcrush.la --librados_la_LDFLAGS = -version-info 1:0:0 -export-symbols-regex '^rados_.*' -lpthread -+librados_la_CXXFLAGS = ${AM_CXXFLAGS} -+librados_la_LIBADD = libcrush.la -lpthread $(OPENSSL_LIBS) -+librados_la_LDFLAGS = -version-info 1:0:0 -export-symbols-regex '^rados_.*' - lib_LTLIBRARIES += librados.la - - librados_a_SOURCES = ${librados_SOURCES} -@@ -170,21 +170,21 @@ - librados_a_CXXFLAGS = ${AM_CXXFLAGS} - - rados_SOURCES = rados.cc --rados_LDADD = librados.la -lpthread -lm -lcrypto -+rados_LDADD = librados.la -lpthread -lm $(OPENSSL_LIBS) - bin_PROGRAMS += rados - - if WITH_DEBUG - testrados_SOURCES = testrados.c --testrados_LDADD = librados.la -lpthread -lm -lcrypto -+testrados_LDADD = librados.la -lpthread -lm $(OPENSSL_LIBS) - testradospp_SOURCES = testradospp.cc --testradospp_LDADD = librados.la -lpthread -lm -lcrypto -+testradospp_LDADD = librados.la -lpthread -lm $(OPENSSL_LIBS) - bin_PROGRAMS += testrados testradospp - endif - - radosacl_SOURCES = radosacl.cc --radosacl_LDADD = librados.la -lpthread -lm -lcrypto -+radosacl_LDADD = librados.la -lpthread -lm $(OPENSSL_LIBS) - rbd_SOURCES = rbd.cc --rbd_LDADD = librados.la -lpthread -lm -lcrypto -+rbd_LDADD = librados.la -lpthread -lm $(OPENSSL_LIBS) - bin_PROGRAMS += radosacl rbd - - if WITH_RADOSGW -@@ -201,19 +201,19 @@ - # lib_LTLIBRARIES += libradosgw.a - - radosgw_SOURCES = rgw/rgw_main.cc --radosgw_LDADD = libradosgw.a librados.a libcrush.a -lfcgi -lcrypto -lexpat -lpthread -lm -+radosgw_LDADD = libradosgw.a librados.a libcrush.a -lfcgi $(OPENSSL_LIBS) -lexpat -lpthread -lm - radosgw_admin_SOURCES = rgw/rgw_admin.cc --radosgw_admin_LDADD = libradosgw.a librados.a libcrush.a -lfcgi -lcrypto -lexpat -lpthread -lm -+radosgw_admin_LDADD = libradosgw.a librados.a libcrush.a -lfcgi $(OPENSSL_LIBS) -lexpat -lpthread -lm - bin_PROGRAMS += radosgw radosgw_admin - endif - - if WITH_DEBUG - testcrypto_SOURCES = testcrypto.cc --testcrypto_LDADD = libcommon.a -lpthread -lm -lcrypto -+testcrypto_LDADD = libcommon.a -lpthread -lm $(OPENSSL_LIBS) - bin_PROGRAMS += testcrypto - - testkeys_SOURCES = testkeys.cc --testkeys_LDADD = libmon.a libcommon.a -lpthread -lm -lcrypto -+testkeys_LDADD = libmon.a libcommon.a -lpthread -lm $(OPENSSL_LIBS) - bin_PROGRAMS += testkeys - endif - -@@ -221,7 +221,7 @@ - ## rados object classes - - #libcls_crypto.so: cls_crypto.cc --# ${CXX} -I. -fPIC -shared -g -o libcls_crypto.so -lcrypto cls_crypto.cc -+# ${CXX} -I. -fPIC -shared -g -o libcls_crypto.so $(OPENSSL_LIBS) cls_crypto.cc - #BUILT_SOURCES += libcls_crypto.so - - #libcls_acl.so: cls_acl.cc -@@ -271,8 +271,8 @@ - LDADD = - - --AM_CXXFLAGS = -Wall -D__CEPH__ -D_FILE_OFFSET_BITS=64 -D_REENTRANT -D_THREAD_SAFE -rdynamic --AM_CFLAGS = -Wall -D__CEPH__ -D_FILE_OFFSET_BITS=64 -D_REENTRANT -D_THREAD_SAFE -rdynamic -+AM_CXXFLAGS = $(OPENSSL_CFLAGS) -Wall -D__CEPH__ -D_FILE_OFFSET_BITS=64 -D_REENTRANT -D_THREAD_SAFE -rdynamic -+AM_CFLAGS = $(OPENSSL_CFLAGS) -Wall -D__CEPH__ -D_FILE_OFFSET_BITS=64 -D_REENTRANT -D_THREAD_SAFE -rdynamic - AM_LDFLAGS = - - if WITH_LIBATOMIC -@@ -294,7 +294,7 @@ - - - # work around old versions of automake that don't define $docdir --docdir = ${datadir}/doc/ceph -+# docdir = ${datadir}/doc/ceph - - install-data-local: - $(install_sh_SCRIPT) -m 0755 cclass $(DESTDIR)$(bindir)/cclass diff --git a/sys-cluster/ceph/files/ceph-0.22.2-asneeded.patch b/sys-cluster/ceph/files/ceph-0.22.2-asneeded.patch new file mode 100644 index 000000000..2dc16f565 --- /dev/null +++ b/sys-cluster/ceph/files/ceph-0.22.2-asneeded.patch @@ -0,0 +1,241 @@ +Fix build with as-needed + +--- ceph-0.22/configure.ac ++++ ceph-0.22/configure.ac +@@ -160,6 +160,7 @@ + AC_CHECK_HEADER([openssl/md5.h], + [], + [AC_MSG_ERROR([Sorry you need openssl dev files (libssl-dev on debian)])]) ++PKG_CHECK_MODULES([OPENSSL], [openssl]) + + AC_CHECK_HEADERS([sys/xattr.h arpa/inet.h netdb.h netinet/in.h sys/file.h sys/ioctl.h sys/mount.h sys/param.h sys/socket.h sys/statvfs.h sys/time.h sys/vfs.h syslog.h utime.h]) + +--- ceph-0.22.2/src/Makefile.am ++++ ceph-0.22.2/src/Makefile.am +@@ -10,37 +10,37 @@ + + # monitor + cmon_SOURCES = cmon.cc msg/SimpleMessenger.cc +-cmon_LDADD = libmon.a libcrush.a libcommon.a -lpthread -lm -lcrypto ++cmon_LDADD = libmon.a libcrush.a libcommon.a -lpthread -lm $(OPENSSL_LIBS) + bin_PROGRAMS += cmon + + # osd + cosd_SOURCES = cosd.cc msg/SimpleMessenger.cc objclass/class_debug.cc \ + objclass/class_api.cc +-cosd_LDADD = libosd.a libos.a libcrush.a libcommon.a -ldl -lpthread -lm -lcrypto ++cosd_LDADD = libosd.a libos.a libcrush.a libcommon.a -ldl -lpthread -lm $(OPENSSL_LIBS) + bin_PROGRAMS += cosd + cosd_CXXFLAGS = ${AM_CFLAGS} + + # mds + cmds_SOURCES = cmds.cc msg/SimpleMessenger.cc +-cmds_LDADD = libmds.a libosdc.a libcrush.a libcommon.a -lpthread -lm -lcrypto ++cmds_LDADD = libmds.a libosdc.a libcrush.a libcommon.a -lpthread -lm $(OPENSSL_LIBS) + bin_PROGRAMS += cmds + cmds_CXXFLAGS = ${AM_CFLAGS} + + # admin tools + ceph_SOURCES = ceph.cc msg/SimpleMessenger.cc +-ceph_LDADD = libcrush.a libcommon.a -ledit -lpthread -lm -lcrypto ++ceph_LDADD = libcrush.a libcommon.a -ledit -lpthread -lm $(OPENSSL_LIBS) + cconf_SOURCES = cconf.cc +-cconf_LDADD = libcommon.a -lpthread -lm -lcrypto ++cconf_LDADD = libcommon.a -lpthread -lm $(OPENSSL_LIBS) + cauthtool_SOURCES = cauthtool.cc +-cauthtool_LDADD = libcommon.a -lpthread -lm -lcrypto ++cauthtool_LDADD = libcommon.a -lpthread -lm $(OPENSSL_LIBS) + bin_PROGRAMS += ceph cconf cauthtool + + monmaptool_SOURCES = monmaptool.cc +-monmaptool_LDADD = libcommon.a -lpthread -lm -lcrypto ++monmaptool_LDADD = libcommon.a -lpthread -lm $(OPENSSL_LIBS) + crushtool_SOURCES = crushtool.cc +-crushtool_LDADD = libcrush.a libcommon.a -lpthread -lm -lcrypto ++crushtool_LDADD = libcrush.a libcommon.a -lpthread -lm $(OPENSSL_LIBS) + osdmaptool_SOURCES = osdmaptool.cc +-osdmaptool_LDADD = libcrush.a libcommon.a -lpthread -lm -lcrypto ++osdmaptool_LDADD = libcrush.a libcommon.a -lpthread -lm $(OPENSSL_LIBS) + bin_PROGRAMS += monmaptool crushtool osdmaptool + + mount_ceph_SOURCES = mount/mount.ceph.c +@@ -48,7 +48,7 @@ + + # synthetic client + csyn_SOURCES = csyn.cc msg/SimpleMessenger.cc +-csyn_LDADD = libclient.a libosdc.a libcrush.a libcommon.a -lpthread -lm -lcrypto ++csyn_LDADD = libclient.a libosdc.a libcrush.a libcommon.a -lpthread -lm $(OPENSSL_LIBS) + bin_PROGRAMS += csyn + + core: cmon cosd cmds ceph cconf monmaptool osdmaptool crushtool csyn +@@ -57,7 +57,7 @@ + # fuse targets? + if WITH_FUSE + cfuse_SOURCES = cfuse.cc msg/SimpleMessenger.cc client/fuse.cc client/fuse_ll.cc +-cfuse_LDADD = -lfuse libclient.a libosdc.a libcrush.a libcommon.a -lpthread -lm -lcrypto ++cfuse_LDADD = -lfuse libclient.a libosdc.a libcrush.a libcommon.a -lpthread -lm $(OPENSSL_LIBS) + cfuse_CXXFLAGS = ${AM_CFLAGS} + bin_PROGRAMS += cfuse + +@@ -87,26 +87,26 @@ + if WITH_DEBUG + + psim_SOURCES = psim.cc +-psim_LDADD = libcrush.a libcommon.a -lpthread -lm -lcrypto ++psim_LDADD = libcrush.a libcommon.a -lpthread -lm $(OPENSSL_LIBS) + bin_PROGRAMS += psim + + testmsgr_SOURCES = testmsgr.cc msg/SimpleMessenger.cc +-testmsgr_LDADD = libcommon.a -lpthread -lm -lcrypto ++testmsgr_LDADD = libcommon.a -lpthread -lm $(OPENSSL_LIBS) + bin_PROGRAMS += testmsgr + + test_ioctls_SOURCES = client/test_ioctls.c + bin_PROGRAMS += test_ioctls + + dumpjournal_SOURCES = dumpjournal.cc msg/SimpleMessenger.cc +-dumpjournal_LDADD = libosdc.a libcrush.a libcommon.a -lpthread -lm -lcrypto ++dumpjournal_LDADD = libosdc.a libcrush.a libcommon.a -lpthread -lm $(OPENSSL_LIBS) + dupstore_SOURCES = dupstore.cc +-dupstore_LDADD = libos.a libcommon.a -lpthread -lm -lcrypto ++dupstore_LDADD = libos.a libcommon.a -lpthread -lm $(OPENSSL_LIBS) + streamtest_SOURCES = streamtest.cc +-streamtest_LDADD = libos.a libcommon.a -lpthread -lm -lcrypto ++streamtest_LDADD = libos.a libcommon.a -lpthread -lm $(OPENSSL_LIBS) + bin_PROGRAMS += dumpjournal dupstore streamtest + + test_trans_SOURCES = test_trans.cc +-test_trans_LDADD = libos.a libcommon.a -lpthread -lm -lcrypto ++test_trans_LDADD = libos.a libcommon.a -lpthread -lm $(OPENSSL_LIBS) + bin_PROGRAMS += test_trans + + +@@ -130,7 +130,8 @@ + crush/hash.c + libcrush_la_CFLAGS = ${AM_CFLAGS} + libcrush_la_CXXFLAGS = ${AM_CXXFLAGS} +-libcrush_la_LDFLAGS = -version-info 1:0:0 -export-symbols-regex 'crush_.*' -lm ++libcrush_la_LDFLAGS = -version-info 1:0:0 -export-symbols-regex 'crush_.*' ++libcrush_la_LIBADD = -lm + lib_LTLIBRARIES += libcrush.la + + # libceph +@@ -142,17 +143,17 @@ + ${libosdc_a_SOURCES} + libceph_la_CFLAGS = ${AM_CFLAGS} + libceph_la_CXXFLAGS= ${AM_CXXFLAGS} +-libceph_la_LIBADD = libcrush.la +-libceph_la_LDFLAGS = -version-info 1:0:0 -export-symbols-regex '^ceph_.*' -lpthread -lssl ++libceph_la_LIBADD = libcrush.la -lpthread $(OPENSSL_LIBS) ++libceph_la_LDFLAGS = -version-info 1:0:0 -export-symbols-regex '^ceph_.*' + lib_LTLIBRARIES += libceph.la + + if WITH_DEBUG + testceph_SOURCES = client/testceph.cc +-testceph_LDADD = libceph.la libcrush.la -lpthread -lm -lcrypto ++testceph_LDADD = libceph.la libcrush.la -lpthread -lm $(OPENSSL_LIBS) + bin_PROGRAMS += testceph + + testtimers_SOURCES = test/TestTimers.cc +-testtimers_LDADD = libceph.la libcrush.la -lpthread -lm -lcrypto ++testtimers_LDADD = libceph.la libcrush.la -lpthread -lm $(OPENSSL_LIBS) + bin_PROGRAMS += testtimers + + endif +@@ -166,8 +167,8 @@ + librados_la_SOURCES = ${librados_SOURCES} + librados_la_CFLAGS = ${AM_CFLAGS} + librados_la_CXXFLAGS = ${AM_CXXFLAGS} +-librados_la_LIBADD = libcrush.la +-librados_la_LDFLAGS = -version-info 1:0:0 -export-symbols-regex '^rados_.*' -lpthread ++librados_la_LIBADD = libcrush.la -lpthread $(OPENSSL_LIBS) ++librados_la_LDFLAGS = -version-info 1:0:0 -export-symbols-regex '^rados_.*' + lib_LTLIBRARIES += librados.la + + librados_a_SOURCES = ${librados_SOURCES} +@@ -175,21 +176,21 @@ + librados_a_CXXFLAGS = ${AM_CXXFLAGS} + + rados_SOURCES = rados.cc +-rados_LDADD = librados.la -lpthread -lm -lcrypto ++rados_LDADD = librados.la -lpthread -lm $(OPENSSL_LIBS) + bin_PROGRAMS += rados + + if WITH_DEBUG + testrados_SOURCES = testrados.c +-testrados_LDADD = librados.la -lpthread -lm -lcrypto ++testrados_LDADD = librados.la -lpthread -lm $(OPENSSL_LIBS) + testradospp_SOURCES = testradospp.cc +-testradospp_LDADD = librados.la -lpthread -lm -lcrypto ++testradospp_LDADD = librados.la -lpthread -lm $(OPENSSL_LIBS) + bin_PROGRAMS += testrados testradospp + endif + + radosacl_SOURCES = radosacl.cc +-radosacl_LDADD = librados.la -lpthread -lm -lcrypto ++radosacl_LDADD = librados.la -lpthread -lm $(OPENSSL_LIBS) + rbd_SOURCES = rbd.cc +-rbd_LDADD = librados.la -lpthread -lm -lcrypto ++rbd_LDADD = librados.la -lpthread -lm $(OPENSSL_LIBS) + bin_PROGRAMS += radosacl rbd + + if WITH_RADOSGW +@@ -206,19 +207,19 @@ + # lib_LTLIBRARIES += libradosgw.a + + radosgw_SOURCES = rgw/rgw_main.cc +-radosgw_LDADD = libradosgw.a librados.a libcrush.a -lfcgi -lcrypto -lexpat -lpthread -lm ++radosgw_LDADD = libradosgw.a librados.a libcrush.a -lfcgi $(OPENSSL_LIBS) -lexpat -lpthread -lm + radosgw_admin_SOURCES = rgw/rgw_admin.cc +-radosgw_admin_LDADD = libradosgw.a librados.a libcrush.a -lfcgi -lcrypto -lexpat -lpthread -lm ++radosgw_admin_LDADD = libradosgw.a librados.a libcrush.a -lfcgi $(OPENSSL_LIBS) -lexpat -lpthread -lm + bin_PROGRAMS += radosgw radosgw_admin + endif + + if WITH_DEBUG + testcrypto_SOURCES = testcrypto.cc +-testcrypto_LDADD = libcommon.a -lpthread -lm -lcrypto ++testcrypto_LDADD = libcommon.a -lpthread -lm $(OPENSSL_LIBS) + bin_PROGRAMS += testcrypto + + testkeys_SOURCES = testkeys.cc +-testkeys_LDADD = libmon.a libcommon.a -lpthread -lm -lcrypto ++testkeys_LDADD = libmon.a libcommon.a -lpthread -lm $(OPENSSL_LIBS) + bin_PROGRAMS += testkeys + endif + +@@ -226,7 +227,7 @@ + ## rados object classes + + #libcls_crypto.so: cls_crypto.cc +-# ${CXX} -I. -fPIC -shared -g -o libcls_crypto.so -lcrypto cls_crypto.cc ++# ${CXX} -I. -fPIC -shared -g -o libcls_crypto.so $(OPENSSL_LIBS) cls_crypto.cc + #BUILT_SOURCES += libcls_crypto.so + + #libcls_acl.so: cls_acl.cc +@@ -237,7 +238,8 @@ + libcls_rbd_la_SOURCES = cls_rbd.cc + libcls_rbd_la_CFLAGS = ${AM_CFLAGS} + libcls_rbd_la_CXXFLAGS= ${AM_CXXFLAGS} +-libcls_rbd_la_LDFLAGS = -version-info 1:0:0 -export-symbols-regex '.*__cls_.*' -lpthread ++libcls_rbd_la_LIBADD = -lpthread ++libcls_rbd_la_LDFLAGS = -version-info 1:0:0 -export-symbols-regex '.*__cls_.*' + + radoslibdir = $(libdir)/rados-classes + radoslib_LTLIBRARIES = libcls_rbd.la +@@ -276,12 +278,12 @@ + LDADD = + + +-AM_CXXFLAGS = -Wall -D__CEPH__ -D_FILE_OFFSET_BITS=64 -D_REENTRANT -D_THREAD_SAFE -rdynamic +-AM_CFLAGS = -Wall -D__CEPH__ -D_FILE_OFFSET_BITS=64 -D_REENTRANT -D_THREAD_SAFE -rdynamic ++AM_CXXFLAGS = $(OPENSSL_CFLAGS) -Wall -D__CEPH__ -D_FILE_OFFSET_BITS=64 -D_REENTRANT -D_THREAD_SAFE -rdynamic ++AM_CFLAGS = $(OPENSSL_CFLAGS) -Wall -D__CEPH__ -D_FILE_OFFSET_BITS=64 -D_REENTRANT -D_THREAD_SAFE -rdynamic + AM_LDFLAGS = + + if WITH_LIBATOMIC +-AM_LDFLAGS += -latomic_ops ++LDADD += -latomic_ops + endif + + noinst_LIBRARIES = \ -- cgit v1.2.3-65-gdbad