vapier 15/03/06 09:12:42 Added: leveldb-1.18-configure.patch Log: Fix USE=-snappy handling #541186 by Johan Bergström. Move memenv.h header to leveldb/helpers/ to match Debian. (Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Revision Changes Path 1.1 dev-libs/leveldb/files/leveldb-1.18-configure.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/leveldb/files/leveldb-1.18-configure.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/leveldb/files/leveldb-1.18-configure.patch?rev=1.1&content-type=text/plain Index: leveldb-1.18-configure.patch =================================================================== we'll handle configure ourselves in src_configure --- a/Makefile +++ b/Makefile @@ -14,9 +14,6 @@ OPT ?= -O2 -DNDEBUG # OPT ?= -O2 -g2 -DNDEBUG #----------------------------------------------- -# detect what platform we're building on -$(shell CC="$(CC)" CXX="$(CXX)" TARGET_OS="$(TARGET_OS)" \ - ./build_detect_platform build_config.mk ./) # this file is generated by the previous line to set build flags and sources include build_config.mk control snappy/tcmalloc explicitly --- a/build_detect_platform +++ a/build_detect_platform @@ -190,6 +190,7 @@ COMMON_FLAGS="$COMMON_FLAGS -DLEVELDB_PLATFORM_POSIX" fi +if [ "${USE_SNAPPY:-auto}" = "auto" ]; then # Test whether Snappy library is installed # http://code.google.com/p/snappy/ $CXX $CXXFLAGS -x c++ - -o $CXXOUTPUT 2>/dev/null <<EOF @@ -197,15 +198,24 @@ int main() {} EOF if [ "$?" = 0 ]; then + USE_SNAPPY="yes" + fi +fi + if [ "$USE_SNAPPY" = "yes" ]; then COMMON_FLAGS="$COMMON_FLAGS -DSNAPPY" PLATFORM_LIBS="$PLATFORM_LIBS -lsnappy" fi +if [ "${USE_TCMALLOC:-auto}" = "auto" ]; then # Test whether tcmalloc is available $CXX $CXXFLAGS -x c++ - -o $CXXOUTPUT -ltcmalloc 2>/dev/null <<EOF int main() {} EOF if [ "$?" = 0 ]; then + USE_TCMALLOC="yes" + fi +fi + if [ "$USE_TCMALLOC" = "yes" ]; then PLATFORM_LIBS="$PLATFORM_LIBS -ltcmalloc" fi
