Remove the pthread chunk.
Respect CXX. Sync WANTLIB. ok jasper@
This commit is contained in:
parent
e2f56a05fa
commit
a23da81cf1
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.7 2012/08/21 00:28:34 jmatthew Exp $
|
||||
# $OpenBSD: Makefile,v 1.8 2012/08/21 13:51:12 ajacoutot Exp $
|
||||
|
||||
#'atomic_pointer.h: error Please implement AtomicPointer for this platform' on other archs
|
||||
ONLY_FOR_ARCHS= i386 amd64 arm
|
||||
@ -8,6 +8,7 @@ COMMENT= fast and lightweight key/value database library
|
||||
DISTNAME= leveldb-1.5.0
|
||||
SHARED_LIBS= leveldb 1.0
|
||||
CATEGORIES= databases
|
||||
REVISION= 0
|
||||
|
||||
HOMEPAGE= http://leveldb.googlecode.com/
|
||||
|
||||
@ -17,12 +18,12 @@ PERMIT_PACKAGE_FTP= Yes
|
||||
PERMIT_DISTFILES_CDROM= Yes
|
||||
PERMIT_DISTFILES_FTP= Yes
|
||||
|
||||
WANTLIB += c m pthread stdc++
|
||||
|
||||
MASTER_SITES= http://leveldb.googlecode.com/files/
|
||||
|
||||
WANTLIB += m stdc++
|
||||
|
||||
USE_GMAKE= Yes
|
||||
MAKE_ENV+= CC=c++ OPT="${CXXFLAGS}" \
|
||||
MAKE_ENV+= CXX=${CXX} OPT="${CXXFLAGS}" \
|
||||
SHARED_MAJOR=${LIBleveldb_VERSION:R} \
|
||||
SHARED_MINOR=${LIBleveldb_VERSION:E}
|
||||
|
||||
|
@ -1,6 +1,4 @@
|
||||
$OpenBSD: patch-build_detect_platform,v 1.3 2012/08/21 00:28:34 jmatthew Exp $
|
||||
|
||||
Use -lpthread instead of -pthread.
|
||||
$OpenBSD: patch-build_detect_platform,v 1.4 2012/08/21 13:51:12 ajacoutot Exp $
|
||||
|
||||
Skip checks for <cstdatomic>, snappy and tcmalloc. We don't
|
||||
have any of these, and with our current binutils, c++ -o /dev/null
|
||||
@ -8,15 +6,6 @@ deletes /dev/null, which is kind of bad.
|
||||
|
||||
--- build_detect_platform.orig Thu May 31 02:56:59 2012
|
||||
+++ build_detect_platform Mon Aug 20 10:25:20 2012
|
||||
@@ -91,7 +91,7 @@ case "$TARGET_OS" in
|
||||
OpenBSD)
|
||||
PLATFORM=OS_OPENBSD
|
||||
COMMON_FLAGS="-fno-builtin-memcmp -D_REENTRANT -DOS_OPENBSD"
|
||||
- PLATFORM_LDFLAGS="-pthread"
|
||||
+ PLATFORM_LDFLAGS="-lpthread"
|
||||
PORT_FILE=port/port_posix.cc
|
||||
;;
|
||||
DragonFly)
|
||||
@@ -132,36 +132,8 @@ if [ "$CROSS_COMPILE" = "true" ]; then
|
||||
# Cross-compiling; do not try any compilation tests.
|
||||
true
|
||||
|
Loading…
x
Reference in New Issue
Block a user