diff --git a/common/shlibs b/common/shlibs index 67dc8558acf..2b673e61480 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2772,3 +2772,27 @@ libflatpak.so.0 flatpak-0.9.3_2 libnanomsg.so.5.0.0 nanomsg-1.0.0_2 libindicator3.so.7 libindicator-12.10.1_1 libappindicator3.so.1 libappindicator-12.10.0_1 +librados.so.2 ceph-11.2.0_1 +libcephfs.so.2 ceph-11.2.0_1 +libcls_timeindex.so.1 ceph-11.2.0_1 +libcls_cephfs.so.1 ceph-11.2.0_1 +libcls_log.so.1 ceph-11.2.0_1 +libcls_rbd.so.1 ceph-11.2.0_1 +libcls_lock.so.1 ceph-11.2.0_1 +libcls_statelog.so.1 ceph-11.2.0_1 +libcls_user.so.1 ceph-11.2.0_1 +libcls_kvs.so.1 ceph-11.2.0_1 +libcls_rgw.so.1 ceph-11.2.0_1 +libcls_refcount.so.1 ceph-11.2.0_1 +libcls_lua.so.1 ceph-11.2.0_1 +libcls_journal.so.1 ceph-11.2.0_1 +libcls_version.so.1 ceph-11.2.0_1 +libcls_numops.so.1 ceph-11.2.0_1 +libcls_replica_log.so.1 ceph-11.2.0_1 +libcls_hello.so.1 ceph-11.2.0_1 +librbd.so.1 ceph-11.2.0_1 +libradosstriper.so.1 ceph-11.2.0_1 +librgw.so.2 ceph-11.2.0_1 +libec_isa.so.2 ceph-11.2.0_1 +libceph_snappy.so.2 ceph-11.2.0_1 +libceph_zlib.so.2 ceph-11.2.0_1 diff --git a/srcpkgs/ceph-devel b/srcpkgs/ceph-devel new file mode 120000 index 00000000000..67ea0935105 --- /dev/null +++ b/srcpkgs/ceph-devel @@ -0,0 +1 @@ +ceph \ No newline at end of file diff --git a/srcpkgs/ceph/template b/srcpkgs/ceph/template index 00b58ea3c75..c7f0f824050 100644 --- a/srcpkgs/ceph/template +++ b/srcpkgs/ceph/template @@ -1,49 +1,47 @@ # Template file for 'ceph' pkgname=ceph -version=10.2.3 -revision=3 -build_style=gnu-configure -configure_args="--with-man-pages --with-radosgw --without-openldap - --with-nss --without-cython --without-tcmalloc - --without-crytocpp --without-librocksdb --disable-static" +version=11.2.0 +revision=1 +build_style=cmake +configure_args=" -DWITH_OPENLDAP=OFF -DWITH_NSS=ON -DWITH_LTTNG=OFF -DWITH_SYSTEM_BOOST=ON" hostmakedepends="automake libtool pkg-config yasm python-devel python-setuptools - python-virtualenv python-pip python-Sphinx" + python-virtualenv python-pip python-Sphinx python-Cython python3-Cython" makedepends="zlib-devel bzip2-devel liblzma-devel xfsprogs-devel leveldb-devel - boost-devel expat-devel libcurl-devel fuse-devel libaio-devel libatomic_ops-devel + boost-devel boost-python expat-devel libcurl-devel fuse-devel libaio-devel libatomic_ops-devel libedit-devel ncurses-devel libuuid-devel libblkid-devel eudev-libudev-devel - nss-devel snappy-devel keyutils-devel fcgi-devel" -short_desc="Distributed, fault-tolerant storage platform delivering object, block, and file system" + nss-devel snappy-devel keyutils-devel fcgi-devel jemalloc-devel" +short_desc="Distributed, fault-tolerant storage platform" maintainer="Juan RP " license="GPL-2" homepage="http://ceph.com/" distfiles="http://download.ceph.com/tarballs/ceph-${version}.tar.gz" -checksum=dca933aa14db67b404d836ef510bd418091978edc2f0c74dfc530ba0aa5e8994 +checksum=ac7c16601554adb7150862e5ef8e3df0297ac02453e6000b86c8473c077fcaf3 -# - Needs CRC32 extension on ARMv8 (ODROID-C2 has it) -# - Needs NEON on ARM (armv7+) case "$XBPS_TARGET_MACHINE" in - *-musl) broken="execinfo.h, PTHREAD_RWLOCK_NONRECURSIVE_NP, etc";; - aarch64*) CFLAGS="-march=armv8-a+crc";; - armv7*) CFLAGS="-mfpu=neon";; + *-musl) + broken="Needs a lot of include patching at minimum" + ;; + i686*) + broken="Doesn't correctly detect i686 build" + ;; esac -broken=yes -CXXFLAGS="-fpermissive" -LDFLAGS="-Wl,--no-as-needed" +nocross="Cross builds are not correctly detected" - -pre_configure() { - case "$XBPS_TARGET_MACHINE" in - *-musl) - sed -i '/no resolv library found/s/AC_MSG_FAILURE/AC_MSG_RESULT/' configure.ac - ;; - esac - autoreconf -fi -} post_install() { - mv ${DESTDIR}/sbin/* ${DESTDIR}/usr/bin - mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin - vmkdir usr/share/bash-completion/completions - mv ${DESTDIR}/etc/bash_completion.d/* ${DESTDIR}/usr/share/bash-completion/completions - rm -rf ${DESTDIR}/usr/include + mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin/ + mkdir -p ${DESTDIR}/etc + mv ${DESTDIR}/usr/etc/* ${DESTDIR}/etc/ + + # We aren't runing SYSV + rm -rf ${DESTDIR}/etc/init.d +} + +ceph-devel_package() { + short_desc+=" - development files" + depends="${sourcepkg}>=${version}_${revision}" + pkg_install() { + vmove usr/include + vmove usr/lib/*.so + } }