From 966781671d44a4bcaa4a03c8c59dc280acf2c595 Mon Sep 17 00:00:00 2001

From: Sander Kleykens <sander@kleykens.com>

Date: Sat, 23 Mar 2013 17:16:02 +0100

Subject: [PATCH] Fix /dev/null getting removed during compilation on some

 systems.

---

 src/leveldb/build_detect_platform | 14 ++++++++++++--

 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/leveldb/build_detect_platform b/src/leveldb/build_detect_platform

index 609cb51..bebf607 100755

--- a/src/leveldb/build_detect_platform

+++ src/leveldb/build_detect_platform

@@ -25,6 +25,8 @@

 #       -DSNAPPY                     if the Snappy library is present

 #

+TMPDIR="/tmp"

+

 OUTPUT=$1

 PREFIX=$2

 if test -z "$OUTPUT" || test -z "$PREFIX"; then

@@ -164,7 +166,9 @@ if [ "$CROSS_COMPILE" = "true" ]; then

     true

 else

     # If -std=c++0x works, use <cstdatomic>.  Otherwise use port_posix.h.

-    $CXX $CXXFLAGS -std=c++0x -x c++ - -o /dev/null 2>/dev/null  <<EOF

+    CPP0X_TEST_TEMPFILE="${TMPDIR}/leveldb-build_detect_platform_cpp0x.$$"

+

+    $CXX $CXXFLAGS -std=c++0x -x c++ - -o ${CPP0X_TEST_TEMPFILE} 2>/dev/null  <<EOF

       #include <cstdatomic>

       int main() {}

 EOF

@@ -175,13 +179,19 @@ EOF

         COMMON_FLAGS="$COMMON_FLAGS -DLEVELDB_PLATFORM_POSIX"

     fi

+    rm -f ${CPP0X_TEST_TEMPFILE} > /dev/null 2>&1

+

     # Test whether tcmalloc is available

-    $CXX $CXXFLAGS -x c++ - -o /dev/null -ltcmalloc 2>/dev/null  <<EOF

+    TCMALLOC_TEST_TEMPFILE="${TMPDIR}/leveldb-build_detect_platform_tcmalloc.$$"

+

+    $CXX $CXXFLAGS -x c++ - -o ${TCMALLOC_TEST_TEMPFILE} -ltcmalloc 2>/dev/null  <<EOF

       int main() {}

 EOF

     if [ "$?" = 0 ]; then

         PLATFORM_LIBS="$PLATFORM_LIBS -ltcmalloc"

     fi

+

+    rm -f ${TCMALLOC_TEST_TEMPFILE} > /dev/null 2>&1

 fi

 PLATFORM_CCFLAGS="$PLATFORM_CCFLAGS $COMMON_FLAGS"

-- 

1.8.1.5