rpms
/
ceph
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Re-apply "disable neon build" patch

This commit is contained in:
Boris Ranto 2015-11-11 15:26:26 +01:00
parent bcc7f226bb
commit 68971661e7
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ceph-0.94.1-tcmalloc.patch
View File

@ -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"

2
ceph.spec
View File

@ -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}