[136714] trunk/dports/databases/rocksdb

[stromnov at macports.org]

Revision: 136714
          https://trac.macports.org/changeset/136714
Author:   stromnov at macports.org
Date:     2015-05-24 15:36:25 -0700 (Sun, 24 May 2015)
Log Message:
-----------
rocksdb: update to version 3.11

Modified Paths:
--------------
    trunk/dports/databases/rocksdb/Portfile
    trunk/dports/databases/rocksdb/files/patch-Makefile.diff

Modified: trunk/dports/databases/rocksdb/Portfile
===================================================================
--- trunk/dports/databases/rocksdb/Portfile	2015-05-24 22:31:35 UTC (rev 136713)
+++ trunk/dports/databases/rocksdb/Portfile	2015-05-24 22:36:25 UTC (rev 136714)
@@ -4,7 +4,7 @@
 PortSystem          1.0
 PortGroup           github 1.0
 
-github.setup        facebook rocksdb 3.10.2 rocksdb-
+github.setup        facebook rocksdb 3.11 rocksdb-
 
 revision            0
 categories          databases devel
@@ -18,8 +18,8 @@
 
 homepage            http://rocksdb.org/
 
-checksums           rmd160  7efe2218c567a9138c294ef72298e7c0d26ed369 \
-                    sha256  69b0f415987b2740f8c6065ecc307058ecd9aa2d21e2f53ca6632b845aab28a6
+checksums           rmd160  65d3d10afc3e74aefc6b2b42df4cdb9d5c061693 \
+                    sha256  be5d6bf8b3ae8c9fe4923abb5e43f7a0672cc39f8154b8762f9a717d0a5382d6
 
 depends_lib-append  port:gflags \
                     port:zlib \
@@ -39,5 +39,10 @@
                     PORTABLE=1 \
                     OPT="${configure.optflags}"
 
-destroot.args-append \
-                    prefix=${prefix}
+destroot.env-append CC="${configure.cc}" \
+                    CXX="${configure.cxx}" \
+                    CFLAGS="[get_canonical_archflags cc]" \
+                    CXXFLAGS="[get_canonical_archflags cxx]" \
+                    PORTABLE=1 \
+                    OPT="${configure.optflags}" \
+                    INSTALL_PATH=${destroot}/${prefix}

Modified: trunk/dports/databases/rocksdb/files/patch-Makefile.diff
===================================================================
--- trunk/dports/databases/rocksdb/files/patch-Makefile.diff	2015-05-24 22:31:35 UTC (rev 136713)
+++ trunk/dports/databases/rocksdb/files/patch-Makefile.diff	2015-05-24 22:36:25 UTC (rev 136714)
@@ -1,24 +1,23 @@
---- Makefile.orig	2014-09-02 23:22:25.000000000 +0400
-+++ Makefile	2014-09-03 00:39:15.000000000 +0400
-@@ -175,7 +175,7 @@
- 	release tags valgrind_check whitebox_crash_test format static_lib shared_lib all \
- 	dbg
+--- Makefile.orig	2015-05-24 22:29:28.000000000 +0300
++++ Makefile	2015-05-25 00:42:52.000000000 +0300
+@@ -351,7 +351,7 @@
+ 	dbg rocksdbjavastatic rocksdbjava install install-static install-shared uninstall \
+ 	analyze
  
--all: $(LIBRARY) $(PROGRAMS) $(TESTS)
-+all: $(LIBRARY) $(SHARED) $(PROGRAMS)
+-all: $(LIBRARY) $(BENCHMARKS) $(TOOLS) $(TESTS)
++all: static_lib shared_lib $(TOOLS)
  
  static_lib: $(LIBRARY)
  
-@@ -252,6 +252,12 @@
- format:
- 	build_tools/format-diff.sh
+@@ -866,9 +866,8 @@
+ 		ln -fs $(SHARED4) $(INSTALL_PATH)/lib/$(SHARED2) && \
+ 		ln -fs $(SHARED4) $(INSTALL_PATH)/lib/$(SHARED1)
  
-+install: all
-+	mkdir -p $(DESTDIR)$(prefix)/bin $(DESTDIR)$(prefix)/lib $(DESTDIR)$(prefix)/include
-+	install $(TOOLS) $(DESTDIR)$(prefix)/bin
-+	install $(LIBRARY) $(SHARED) $(DESTDIR)$(prefix)/lib
-+	cp -R include/rocksdb $(DESTDIR)$(prefix)/include
-+
- # ---------------------------------------------------------------------------
- # 	Unit tests and tools
- # ---------------------------------------------------------------------------
+-# install static by default + install shared if it exists
+-install: install-static
+-	[ -e $(SHARED4) ] && $(MAKE) install-shared || :
++install: install-headers install-static install-shared
++	install $(TOOLS) $(INSTALL_PATH)/bin
+ 
+ #-------------------------------------------------
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150524/0dafc22d/attachment.html>