Don't record a bogus SONAME (libleveldb.so.1) in the library.

ok?

Index: Makefile
===================================================================
RCS file: /home/pascal/cvs/ports/databases/leveldb/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile    11 Mar 2013 02:52:05 -0000      1.9
+++ Makefile    19 Mar 2013 13:00:42 -0000
@@ -8,7 +8,7 @@ COMMENT=        fast and lightweight key/value 
 DISTNAME=      leveldb-1.5.0
 SHARED_LIBS=   leveldb 1.0
 CATEGORIES=    databases
-REVISION=      0
+REVISION=      1
 
 HOMEPAGE=      http://leveldb.googlecode.com/
 
Index: patches/patch-Makefile
===================================================================
RCS file: /home/pascal/cvs/ports/databases/leveldb/patches/patch-Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 patch-Makefile
--- patches/patch-Makefile      21 Aug 2012 00:28:34 -0000      1.2
+++ patches/patch-Makefile      19 Mar 2013 13:10:52 -0000
@@ -4,8 +4,10 @@ Allow SHARED_MAJOR and SHARED_MINOR to b
 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
+ 
Index: patches/patch-build_detect_platform
===================================================================
RCS file: 
/home/pascal/cvs/ports/databases/leveldb/patches/patch-build_detect_platform,v
retrieving revision 1.4
diff -u -p -r1.4 patch-build_detect_platform
--- patches/patch-build_detect_platform 21 Aug 2012 13:51:12 -0000      1.4
+++ patches/patch-build_detect_platform 19 Mar 2013 13:11:14 -0000
@@ -4,8 +4,19 @@ Skip checks for <cstdatomic>, snappy and
 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

Reply via email to