Project

General

Profile

Bug #17622 ยป ceph-10.2.3-dontoverloadwhenrunningmakewithoutnproc.diff

Unified diff against Ceph v10.2.3 - Roy Keene, 10/19/2016 05:59 PM

View differences:

ceph-10.2.3-dontoverloadwhenrunningmakewithoutnproc/src/Makefile.in 2016-10-19 12:53:50.908157162 -0500
@ENABLE_SERVER_TRUE@ $(am__append_43)
@ENABLE_SERVER_TRUE@libkv_a_LIBADD = $(am__append_37) $(am__append_40) \
@ENABLE_SERVER_TRUE@ $(am__append_44)
@ENABLE_SERVER_TRUE@@FREEBSD_TRUE@@WITH_SLIBROCKSDB_TRUE@NPROC = sysctl -n hw.ncpu
# build rocksdb with its own makefile
# for some stupid reason this needs -fPIC...
# PORTABLE=1 fixes the aarch64 build (-march=native doesn't work there)
@ENABLE_SERVER_TRUE@@WITH_SLIBROCKSDB_TRUE@NPROC = nproc
libmon_types_la_SOURCES = \
mon/PGMap.cc
......
# $(srcdir)/crush/mapper.h \
# $(srcdir)/crush/types.h
@ENABLE_SERVER_TRUE@@WITH_SLIBROCKSDB_TRUE@rocksdb/librocksdb.a:
@ENABLE_SERVER_TRUE@@WITH_SLIBROCKSDB_TRUE@ cd rocksdb && CC="${CC}" CXX="${CXX}" EXTRA_CXXFLAGS=-fPIC PORTABLE=1 $(MAKE) -j$(shell ${NPROC}) static_lib
@ENABLE_SERVER_TRUE@@WITH_SLIBROCKSDB_TRUE@ cd rocksdb && CC="${CC}" CXX="${CXX}" EXTRA_CXXFLAGS=-fPIC PORTABLE=1 $(MAKE) static_lib
@ENABLE_SERVER_TRUE@@WITH_SPDK_TRUE@${SPDK_SRCDIR}/nvme/libspdk_nvme.a:
@ENABLE_SERVER_TRUE@@WITH_SPDK_TRUE@ $(MAKE) -C ${SPDK_SRCDIR}/nvme DPDK_INC=${LIBDPDK_CFLAGS}
@ENABLE_SERVER_TRUE@@WITH_SPDK_TRUE@${SPDK_SRCDIR}/memory/libspdk_memory.a:
ceph-10.2.3-dontoverloadwhenrunningmakewithoutnproc/src/kv/Makefile.am 2016-10-19 12:51:04.172839742 -0500
# build rocksdb with its own makefile
# for some stupid reason this needs -fPIC...
# PORTABLE=1 fixes the aarch64 build (-march=native doesn't work there)
NPROC = nproc
if FREEBSD
NPROC = sysctl -n hw.ncpu
endif
rocksdb/librocksdb.a:
cd rocksdb && CC="${CC}" CXX="${CXX}" EXTRA_CXXFLAGS=-fPIC PORTABLE=1 $(MAKE) -j$(shell ${NPROC}) static_lib
cd rocksdb && CC="${CC}" CXX="${CXX}" EXTRA_CXXFLAGS=-fPIC PORTABLE=1 $(MAKE) static_lib
libkv_a_CXXFLAGS += -I rocksdb/include -fPIC
libkv_a_SOURCES += kv/RocksDBStore.cc
libkv_a_LIBADD += rocksdb/librocksdb.a
    (1-1/1)