cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Do not use SONAME, ok brad@ benoit@

Browse Source 
* Fold PFRAG.shared into PLIST, ok benoit@
This commit is contained in:
pascal 2013-03-21 21:30:30 +00:00
parent 5f56ca54bb
commit e154215ad3
4 changed files with 32 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
databases/leveldb/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.9 2013/03/11 02:52:05 espie Exp $
# $OpenBSD: Makefile,v 1.10 2013/03/21 21:30:30 pascal Exp $
#'atomic_pointer.h: error Please implement AtomicPointer for this platform' on other archs
ONLY_FOR_ARCHS= i386 amd64 arm
@ -8,7 +8,7 @@ COMMENT= fast and lightweight key/value database library
DISTNAME= leveldb-1.5.0
SHARED_LIBS= leveldb 1.0
CATEGORIES= databases
REVISION= 0
REVISION= 1
HOMEPAGE= http://leveldb.googlecode.com/

17
databases/leveldb/patches/patch-Makefile
View File

@ -1,11 +1,13 @@
$OpenBSD: patch-Makefile,v 1.2 2012/08/21 00:28:34 jmatthew Exp $
$OpenBSD: patch-Makefile,v 1.3 2013/03/21 21:30:30 pascal Exp $
Allow SHARED_MAJOR and SHARED_MINOR to be overridden.
This doesn't affect kMajorVersion and kMinorVersion in db.h,
but nothing uses them anyway.
--- Makefile.orig Fri Aug 17 22:08:25 2012
+++ Makefile Fri Aug 17 22:08:04 2012
Do not use SONAME.
--- Makefile.orig Wed May 30 18:56:59 2012
+++ Makefile Tue Mar 19 14:06:40 2013
@@ -69,8 +69,8 @@ SHARED3 = $(SHARED1)
SHARED = $(SHARED1)
else
@ -17,3 +19,12 @@ but nothing uses them anyway.
SHARED1 = libleveldb.$(PLATFORM_SHARED_EXT)
SHARED2 = $(SHARED1).$(SHARED_MAJOR)
SHARED3 = $(SHARED1).$(SHARED_MAJOR).$(SHARED_MINOR)
@@ -82,7 +82,7 @@ $(SHARED2): $(SHARED3)
endif
$(SHARED3):
- $(CXX) $(LDFLAGS) $(PLATFORM_SHARED_LDFLAGS)$(SHARED2) $(CXXFLAGS) $(PLATFORM_SHARED_CFLAGS) $(SOURCES) -o $(SHARED3)
+ $(CXX) $(LDFLAGS) $(PLATFORM_SHARED_LDFLAGS) $(CXXFLAGS) $(PLATFORM_SHARED_CFLAGS) $(SOURCES) -o $(SHARED3)
endif # PLATFORM_SHARED_EXT

17
databases/leveldb/patches/patch-build_detect_platform
View File

@ -1,11 +1,22 @@
$OpenBSD: patch-build_detect_platform,v 1.4 2012/08/21 13:51:12 ajacoutot Exp $
$OpenBSD: patch-build_detect_platform,v 1.5 2013/03/21 21:30:30 pascal Exp $
Skip checks for <cstdatomic>, snappy and tcmalloc. We don't
have any of these, and with our current binutils, c++ -o /dev/null
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
Do not use SONAME.
--- build_detect_platform.orig Wed May 30 18:56:59 2012
+++ build_detect_platform Tue Mar 19 14:05:59 2013
@@ -51,7 +51,7 @@ PLATFORM_CCFLAGS=
PLATFORM_CXXFLAGS=
PLATFORM_LDFLAGS=
PLATFORM_SHARED_EXT="so"
-PLATFORM_SHARED_LDFLAGS="-shared -Wl,-soname -Wl,"
+PLATFORM_SHARED_LDFLAGS="-shared"
PLATFORM_SHARED_CFLAGS="-fPIC"
PLATFORM_SHARED_VERSIONED=true
@@ -132,36 +132,8 @@ if [ "$CROSS_COMPILE" = "true" ]; then
# Cross-compiling; do not try any compilation tests.
true

3
databases/leveldb/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.3 2012/08/21 00:28:34 jmatthew Exp $
@comment $OpenBSD: PLIST,v 1.4 2013/03/21 21:30:30 pascal Exp $
%%SHARED%%
include/leveldb/
include/leveldb/c.h
@ -15,6 +15,7 @@ include/leveldb/table.h
include/leveldb/table_builder.h
include/leveldb/write_batch.h
lib/libleveldb.a
@lib lib/libleveldb.so.${LIBleveldb_VERSION}
share/doc/leveldb/
share/doc/leveldb/bench/
share/doc/leveldb/bench/db_bench_sqlite3.cc