Ticket #55584: leveldb.diff

File leveldb.diff, 8.0 KB (added by RJVB (René Bertin), 7 years ago)

  • databases/leveldb/Portfile 

    diff --git a/databases/leveldb/Portfile b/databases/leveldb/Portfile
index 01354a3..34b2e12 100644
    a b PortGroup github 1.0 
    1414# We therefore use muniversal PortGroup
    1515PortGroup           muniversal 1.0
    1616
    17 github.setup        google leveldb 1.19 v
     17github.setup        google leveldb 1.20 v
    1818
    1919categories          databases
    2020platforms           darwin
    … … maintainers nomaintainer 
    2323description         A fast and lightweight key/value database library by Google
    2424long_description    A fast and lightweight key/value database library by Google
    2525
    26 checksums           rmd160  9586c14604093fe2ca855539f7d69ce55c999da5 \
    27                     sha256  6835203e749f7f437f87f7fb788e96d0718f62ca28c0160a35f48d1ba17a8e7b
     26checksums           rmd160  dd72b89d356031709df9a41da2c31ea2e093361d \
     27                    sha256  154d804980d92b08d08dafff8e937ad79a45ef0fe87c9f5d69ea74690f85a933
    2828
    29 depends_lib         port:snappy
     29depends_lib         port:snappy \
     30                    port:gperftools
    3031
    3132patchfiles          install_name.patch
    3233
    … … build.env-append \ 
    4950    CXX="${configure.cxx}"                \
    5051    OPT="${configure.optflags} -DNDEBUG"
    5152
     53use_parallel_build      yes
     54
    5255# muniversal build requires Makefile
    5356post-extract {
    5457    set makefile [open ${worksrcpath}/Makefile-Install "w"]

  • databases/leveldb/files/install_name.patch 

    diff --git a/databases/leveldb/files/install_name.patch b/databases/leveldb/files/install_name.patch
index 8c05fa6..2352c13 100644
    a b  
    11https://github.com/google/leveldb/issues/412
    22https://github.com/google/leveldb/pull/413
    3 --- build_detect_platform.orig  2016-08-11 09:33:30.000000000 -0500
    4 +++ build_detect_platform       2016-10-16 16:31:41.000000000 -0500
     3
     4diff --git Makefile Makefile
     5index f7cc7d736c4f20d6cab6e760d43b76e880b80e95..44cfc9f534da9cd91b26bf87e724299c5a200a46 100644
     6--- Makefile
     7+++ Makefile
     8@@ -108,13 +108,13 @@ SIMULATOR_ALLOBJS := $(SIMULATOR_LIBOBJECTS) $(SIMULATOR_MEMENVOBJECTS)
     9 default: all
     10 
     11 # Should we build shared libraries?
     12-ifneq ($(PLATFORM_SHARED_EXT),)
     13+ifeq ($(PLATFORM_SHARED),true)
     14 
     15 # Many leveldb test apps use non-exported API's. Only build a subset for testing.
     16 SHARED_ALLOBJS := $(SHARED_LIBOBJECTS) $(SHARED_MEMENVOBJECTS) $(TESTHARNESS)
     17 
     18+SHARED_LIB1 = $(PLATFORM_SHARED_BASE)$(PLATFORM_SHARED_EXT)
     19 ifneq ($(PLATFORM_SHARED_VERSIONED),true)
     20-SHARED_LIB1 = libleveldb.$(PLATFORM_SHARED_EXT)
     21 SHARED_LIB2 = $(SHARED_LIB1)
     22 SHARED_LIB3 = $(SHARED_LIB1)
     23 SHARED_LIBS = $(SHARED_LIB1)
     24@@ -123,12 +123,11 @@ else
     25 # Update db.h if you change these.
     26 SHARED_VERSION_MAJOR = 1
     27 SHARED_VERSION_MINOR = 20
     28-SHARED_LIB1 = libleveldb.$(PLATFORM_SHARED_EXT)
     29-SHARED_LIB2 = $(SHARED_LIB1).$(SHARED_VERSION_MAJOR)
     30-SHARED_LIB3 = $(SHARED_LIB1).$(SHARED_VERSION_MAJOR).$(SHARED_VERSION_MINOR)
     31+SHARED_LIB2 = $(PLATFORM_SHARED_BASE).$(SHARED_VERSION_MAJOR)$(PLATFORM_SHARED_EXT)
     32+SHARED_LIB3 = $(PLATFORM_SHARED_BASE).$(SHARED_VERSION_MAJOR).$(SHARED_VERSION_MINOR)$(PLATFORM_SHARED_EXT)
     33 SHARED_LIBS = $(SHARED_OUTDIR)/$(SHARED_LIB1) $(SHARED_OUTDIR)/$(SHARED_LIB2) $(SHARED_OUTDIR)/$(SHARED_LIB3)
     34 $(SHARED_OUTDIR)/$(SHARED_LIB1): $(SHARED_OUTDIR)/$(SHARED_LIB3)
     35-       ln -fs $(SHARED_LIB3) $(SHARED_OUTDIR)/$(SHARED_LIB1)
     36+       ln -fs $(SHARED_LIB2) $(SHARED_OUTDIR)/$(SHARED_LIB1)
     37 $(SHARED_OUTDIR)/$(SHARED_LIB2): $(SHARED_OUTDIR)/$(SHARED_LIB3)
     38        ln -fs $(SHARED_LIB3) $(SHARED_OUTDIR)/$(SHARED_LIB2)
     39 SHARED_MEMENVLIB = $(SHARED_OUTDIR)/libmemenv.a
     40@@ -137,7 +136,7 @@ endif
     41 $(SHARED_OUTDIR)/$(SHARED_LIB3): $(SHARED_LIBOBJECTS)
     42        $(CXX) $(LDFLAGS) $(PLATFORM_SHARED_LDFLAGS)$(SHARED_LIB2) $(SHARED_LIBOBJECTS) -o $(SHARED_OUTDIR)/$(SHARED_LIB3) $(LIBS)
     43 
     44-endif  # PLATFORM_SHARED_EXT
     45+endif  # PLATFORM_SHARED
     46 
     47 all: $(SHARED_LIBS) $(SHARED_PROGRAMS) $(STATIC_OUTDIR)/libleveldb.a $(STATIC_OUTDIR)/libmemenv.a $(STATIC_PROGRAMS)
     48 
     49diff --git build_detect_platform build_detect_platform
     50index d2a20ce5b6277594ec256004121195a22b049263..4f721a12c164d1602544e585747ef97aaf864e9c 100755
     51--- build_detect_platform
     52+++ build_detect_platform
    553@@ -8,7 +8,10 @@
    654 #   CXX                         C++ Compiler path
    755 #   PLATFORM_LDFLAGS            Linker flags
    … … https://github.com/google/leveldb/pull/413 
    1462 #   PLATFORM_SHARED_LDFLAGS     Flags for building shared library
    1563 #                               This flag is embedded just before the name
    1664 #                               of the shared library without intervening spaces
    17 @@ -59,7 +62,9 @@
     65@@ -59,7 +62,9 @@ PLATFORM_CCFLAGS=
    1866 PLATFORM_CXXFLAGS=
    1967 PLATFORM_LDFLAGS=
    2068 PLATFORM_LIBS=
    … … https://github.com/google/leveldb/pull/413 
    2573 PLATFORM_SHARED_LDFLAGS="-shared -Wl,-soname -Wl,"
    2674 PLATFORM_SHARED_CFLAGS="-fPIC"
    2775 PLATFORM_SHARED_VERSIONED=true
    28 @@ -81,7 +86,8 @@
     76@@ -83,7 +88,8 @@ case "$TARGET_OS" in
    2977     Darwin)
    3078         PLATFORM=OS_MACOSX
    3179         COMMON_FLAGS="$MEMCMP_FLAG -DOS_MACOSX"
    … … https://github.com/google/leveldb/pull/413 
    3583         [ -z "$INSTALL_PATH" ] && INSTALL_PATH=`pwd`
    3684         PLATFORM_SHARED_LDFLAGS="-dynamiclib -install_name $INSTALL_PATH/"
    3785         PORT_FILE=port/port_posix.cc
    38 @@ -142,7 +148,7 @@
    39          COMMON_FLAGS="$MEMCMP_FLAG -DOS_MACOSX"
     86@@ -154,7 +160,7 @@ case "$TARGET_OS" in
    4087         [ -z "$INSTALL_PATH" ] && INSTALL_PATH=`pwd`
    4188         PORT_FILE=port/port_posix.cc
     89         PORT_SSE_FILE=port/port_posix_sse.cc
    4290-        PLATFORM_SHARED_EXT=
    4391+        PLATFORM_SHARED=false
    4492         PLATFORM_SHARED_LDFLAGS=
    4593         PLATFORM_SHARED_CFLAGS=
    4694         PLATFORM_SHARED_VERSIONED=
    47 @@ -222,6 +228,8 @@
    48  echo "PLATFORM_LIBS=$PLATFORM_LIBS" >> $OUTPUT
     95@@ -250,6 +256,8 @@ echo "PLATFORM_LIBS=$PLATFORM_LIBS" >> $OUTPUT
    4996 echo "PLATFORM_CCFLAGS=$PLATFORM_CCFLAGS" >> $OUTPUT
    5097 echo "PLATFORM_CXXFLAGS=$PLATFORM_CXXFLAGS" >> $OUTPUT
     98 echo "PLATFORM_SSEFLAGS=$PLATFORM_SSEFLAGS" >> $OUTPUT
    5199+echo "PLATFORM_SHARED=$PLATFORM_SHARED" >> $OUTPUT
    52100+echo "PLATFORM_SHARED_BASE=$PLATFORM_SHARED_BASE" >> $OUTPUT
    53101 echo "PLATFORM_SHARED_CFLAGS=$PLATFORM_SHARED_CFLAGS" >> $OUTPUT
    54102 echo "PLATFORM_SHARED_EXT=$PLATFORM_SHARED_EXT" >> $OUTPUT
    55103 echo "PLATFORM_SHARED_LDFLAGS=$PLATFORM_SHARED_LDFLAGS" >> $OUTPUT
    56 --- Makefile.orig       2016-08-11 09:33:30.000000000 -0500
    57 +++ Makefile    2016-10-16 16:41:58.000000000 -0500
    58 @@ -107,13 +107,13 @@
    59  default: all
    60  
    61  # Should we build shared libraries?
    62 -ifneq ($(PLATFORM_SHARED_EXT),)
    63 +ifeq ($(PLATFORM_SHARED),true)
    64  
    65  # Many leveldb test apps use non-exported API's. Only build a subset for testing.
    66  SHARED_ALLOBJS := $(SHARED_LIBOBJECTS) $(SHARED_MEMENVOBJECTS) $(TESTHARNESS)
    67  
    68 +SHARED_LIB1 = $(PLATFORM_SHARED_BASE)$(PLATFORM_SHARED_EXT)
    69  ifneq ($(PLATFORM_SHARED_VERSIONED),true)
    70 -SHARED_LIB1 = libleveldb.$(PLATFORM_SHARED_EXT)
    71  SHARED_LIB2 = $(SHARED_LIB1)
    72  SHARED_LIB3 = $(SHARED_LIB1)
    73  SHARED_LIBS = $(SHARED_LIB1)
    74 @@ -122,9 +122,8 @@
    75  # Update db.h if you change these.
    76  SHARED_VERSION_MAJOR = 1
    77  SHARED_VERSION_MINOR = 19
    78 -SHARED_LIB1 = libleveldb.$(PLATFORM_SHARED_EXT)
    79 -SHARED_LIB2 = $(SHARED_LIB1).$(SHARED_VERSION_MAJOR)
    80 -SHARED_LIB3 = $(SHARED_LIB1).$(SHARED_VERSION_MAJOR).$(SHARED_VERSION_MINOR)
    81 +SHARED_LIB2 = $(PLATFORM_SHARED_BASE).$(SHARED_VERSION_MAJOR)$(PLATFORM_SHARED_EXT)
    82 +SHARED_LIB3 = $(PLATFORM_SHARED_BASE).$(SHARED_VERSION_MAJOR).$(SHARED_VERSION_MINOR)$(PLATFORM_SHARED_EXT)
    83  SHARED_LIBS = $(SHARED_OUTDIR)/$(SHARED_LIB1) $(SHARED_OUTDIR)/$(SHARED_LIB2) $(SHARED_OUTDIR)/$(SHARED_LIB3)
    84  $(SHARED_OUTDIR)/$(SHARED_LIB1): $(SHARED_OUTDIR)/$(SHARED_LIB3)
    85         ln -fs $(SHARED_LIB3) $(SHARED_OUTDIR)/$(SHARED_LIB1)
    86 @@ -136,7 +136,7 @@
    87  $(SHARED_OUTDIR)/$(SHARED_LIB3): $(SHARED_LIBOBJECTS)
    88         $(CXX) $(LDFLAGS) $(PLATFORM_SHARED_LDFLAGS)$(SHARED_LIB2) $(SHARED_LIBOBJECTS) -o $(SHARED_OUTDIR)/$(SHARED_LIB3) $(LIBS)
    89  
    90 -endif  # PLATFORM_SHARED_EXT
    91 +endif  # PLATFORM_SHARED
    92  
    93  all: $(SHARED_LIBS) $(SHARED_PROGRAMS) $(STATIC_OUTDIR)/libleveldb.a $(STATIC_OUTDIR)/libmemenv.a $(STATIC_PROGRAMS)
    94