diff --git a/ceph-0.94.1-tcmalloc.patch b/ceph-0.94.1-tcmalloc.patch deleted file mode 100644 index 5aacb70..0000000 --- a/ceph-0.94.1-tcmalloc.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up ceph-0.94.1/src/rocksdb/configure.ac.tcmalloc ceph-0.94.1/src/rocksdb/configure.ac ---- ceph-0.94.1/src/rocksdb/configure.ac.tcmalloc 2015-06-08 14:03:27.000000000 +0200 -+++ ceph-0.94.1/src/rocksdb/configure.ac 2015-06-08 14:03:41.000000000 +0200 -@@ -19,7 +19,7 @@ AC_CHECK_LIB([snappy], [snappy_compress] - AC_CHECK_LIB([z], [gzread], [HAVE_LIBZ=yes], [AC_MSG_FAILURE([libz not found])]) - AC_CHECK_LIB([bz2], [BZ2_bzCompressInit], [HAVE_LIBBZ2=yes], [AC_MSG_FAILURE([libbz2 not found])]) - AC_CHECK_LIB([rt], [clock_gettime], [HAVE_LIBRT=yes], [AC_MSG_FAILURE([librt not found])]) --AC_CHECK_LIB([tcmalloc], [malloc], [HAVE_LIBTCMALLOC=yes],[AC_MSG_FAILURE([no tcmalloc found ])]) -+AC_CHECK_LIB([tcmalloc], [malloc], [HAVE_LIBTCMALLOC=yes],[AC_MSG_RESULT([no tcmalloc found ])]) - - OLD_CXXFLAGS="$CXXFLAGS" - CXXFLAGS="$CXXFLAGS -std=c++11" diff --git a/ceph.spec b/ceph.spec index f4984c3..06f107d 100644 --- a/ceph.spec +++ b/ceph.spec @@ -67,6 +67,7 @@ Source0: http://ceph.com/download/%{name}-%{version}.tar.bz2 %if 0%{?fedora} || 0%{?rhel} Patch0: init-ceph.in-fedora.patch %endif +Patch1: 0001-Disable-erasure_codelib-neon-build.patch ################################################################################# # dependencies that apply across all distro families ################################################################################# @@ -538,6 +539,7 @@ python-cephfs instead. %if 0%{?fedora} || 0%{?rhel} %patch0 -p1 -b .init %endif +%patch1 -p1 -b .neon %build %if 0%{with cephfs_java}