diff options
| author | Steve Wills <swills@FreeBSD.org> | 2013-04-24 02:42:20 +0000 |
|---|---|---|
| committer | Steve Wills <swills@FreeBSD.org> | 2013-04-24 02:42:20 +0000 |
| commit | f120146efca21d87a92160f983f2576d223f88fe (patch) | |
| tree | 0587fff32d850e170fe70c2ae029a99495ebca62 /net-p2p | |
| parent | - Update to 4.2.1 (diff) | |
- Add patch to prevent deletion of /dev/null
PR: ports/177867
Submitted by: Robert Backahus <robbak@robbak.com> (maintainer)
Notes
Notes:
svn path=/head/; revision=316400
Diffstat (limited to 'net-p2p')
| -rw-r--r-- | net-p2p/bitcoin/Makefile | 1 | ||||
| -rw-r--r-- | net-p2p/bitcoin/files/patch-leveldb_makefile | 58 |
2 files changed, 59 insertions, 0 deletions
diff --git a/net-p2p/bitcoin/Makefile b/net-p2p/bitcoin/Makefile index 92ad7101a276..cc81c7105ba1 100644 --- a/net-p2p/bitcoin/Makefile +++ b/net-p2p/bitcoin/Makefile @@ -3,6 +3,7 @@ PORTNAME= bitcoin PORTVERSION= 0.8.1 +PORTREVISION= 1 CATEGORIES= net-p2p finance MAINTAINER= robbak@robbak.com diff --git a/net-p2p/bitcoin/files/patch-leveldb_makefile b/net-p2p/bitcoin/files/patch-leveldb_makefile new file mode 100644 index 000000000000..7c119352b24b --- /dev/null +++ b/net-p2p/bitcoin/files/patch-leveldb_makefile @@ -0,0 +1,58 @@ +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 + |