Date: Sat, 19 Nov 2016 17:02:40 +0000 (UTC) From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r426395 - in head/databases/leveldb: . files Message-ID: <201611191702.uAJH2eJt064094@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sunpoet Date: Sat Nov 19 17:02:40 2016 New Revision: 426395 URL: https://svnweb.freebsd.org/changeset/ports/426395 Log: - Update to 1.19 Changes: https://github.com/google/leveldb/releases Modified: head/databases/leveldb/Makefile head/databases/leveldb/distinfo head/databases/leveldb/files/patch-Makefile Modified: head/databases/leveldb/Makefile ============================================================================== --- head/databases/leveldb/Makefile Sat Nov 19 17:02:35 2016 (r426394) +++ head/databases/leveldb/Makefile Sat Nov 19 17:02:40 2016 (r426395) @@ -2,9 +2,8 @@ # $FreeBSD$ PORTNAME= leveldb -PORTVERSION= 1.18 +PORTVERSION= 1.19 DISTVERSIONPREFIX= v -PORTREVISION= 1 CATEGORIES= databases MAINTAINER= sunpoet@FreeBSD.org @@ -51,10 +50,10 @@ do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/include/leveldb/ ${STAGEDIR}${PREFIX}/include/memenv/ ${STAGEDIR}${DATADIR}/ ${INSTALL_DATA} ${WRKSRC}/include/leveldb/* ${STAGEDIR}${PREFIX}/include/leveldb/ ${INSTALL_DATA} ${WRKSRC}/helpers/memenv/memenv.h ${STAGEDIR}${PREFIX}/include/memenv/ - ${INSTALL_DATA} ${WRKSRC}/libleveldb.a ${STAGEDIR}${PREFIX}/lib/ - ${INSTALL_LIB} ${WRKSRC}/libleveldb.so.${SHLIB_MAJOR}.${SHLIB_MINOR} ${STAGEDIR}${PREFIX}/lib/ - ${INSTALL_DATA} ${WRKSRC}/libmemenv.a ${STAGEDIR}${PREFIX}/lib/ - ${INSTALL_LIB} ${WRKSRC}/libmemenv.so.${SHLIB_MAJOR}.${SHLIB_MINOR} ${STAGEDIR}${PREFIX}/lib/ + ${INSTALL_LIB} ${WRKSRC}/out-shared/libleveldb.so.${SHLIB_MAJOR}.${SHLIB_MINOR} ${STAGEDIR}${PREFIX}/lib/ + ${INSTALL_LIB} ${WRKSRC}/out-shared/libmemenv.so.${SHLIB_MAJOR}.${SHLIB_MINOR} ${STAGEDIR}${PREFIX}/lib/ + ${INSTALL_DATA} ${WRKSRC}/out-static/libleveldb.a ${STAGEDIR}${PREFIX}/lib/ + ${INSTALL_DATA} ${WRKSRC}/out-static/libmemenv.a ${STAGEDIR}${PREFIX}/lib/ ${LN} -fs libleveldb.so.${SHLIB_MAJOR} ${STAGEDIR}${PREFIX}/lib/libleveldb.so ${LN} -fs libleveldb.so.${SHLIB_MAJOR}.${SHLIB_MINOR} ${STAGEDIR}${PREFIX}/lib/libleveldb.so.${SHLIB_MAJOR} ${LN} -fs libmemenv.so.${SHLIB_MAJOR} ${STAGEDIR}${PREFIX}/lib/libmemenv.so Modified: head/databases/leveldb/distinfo ============================================================================== --- head/databases/leveldb/distinfo Sat Nov 19 17:02:35 2016 (r426394) +++ head/databases/leveldb/distinfo Sat Nov 19 17:02:40 2016 (r426395) @@ -1,2 +1,3 @@ -SHA256 (google-leveldb-v1.18_GH0.tar.gz) = 4aa1a7479bc567b95a59ac6fb79eba49f61884d6fd400f20b7af147d54c5cee5 -SIZE (google-leveldb-v1.18_GH0.tar.gz) = 209376 +TIMESTAMP = 1479416452 +SHA256 (google-leveldb-v1.19_GH0.tar.gz) = 7d7a14ae825e66aabeb156c1c3fae9f9a76d640ef6b40ede74cc73da937e5202 +SIZE (google-leveldb-v1.19_GH0.tar.gz) = 220839 Modified: head/databases/leveldb/files/patch-Makefile ============================================================================== --- head/databases/leveldb/files/patch-Makefile Sat Nov 19 17:02:35 2016 (r426394) +++ head/databases/leveldb/files/patch-Makefile Sat Nov 19 17:02:40 2016 (r426395) @@ -1,25 +1,26 @@ ---- Makefile.orig 2014-09-16 21:19:52 UTC +--- Makefile.orig 2016-08-11 14:33:30 UTC +++ Makefile -@@ -95,9 +95,21 @@ endif - $(SHARED3): - $(CXX) $(LDFLAGS) $(PLATFORM_SHARED_LDFLAGS)$(SHARED2) $(CXXFLAGS) $(PLATFORM_SHARED_CFLAGS) $(SOURCES) -o $(SHARED3) $(LIBS) +@@ -125,12 +125,12 @@ SHARED_VERSION_MINOR = 19 + SHARED_LIB1 = libleveldb.$(PLATFORM_SHARED_EXT) + SHARED_LIB2 = $(SHARED_LIB1).$(SHARED_VERSION_MAJOR) + SHARED_LIB3 = $(SHARED_LIB1).$(SHARED_VERSION_MAJOR).$(SHARED_VERSION_MINOR) +-SHARED_LIBS = $(SHARED_OUTDIR)/$(SHARED_LIB1) $(SHARED_OUTDIR)/$(SHARED_LIB2) $(SHARED_OUTDIR)/$(SHARED_LIB3) ++SHARED_LIBS = $(SHARED_OUTDIR)/$(SHARED_LIB1) $(SHARED_OUTDIR)/$(SHARED_LIB2) $(SHARED_OUTDIR)/$(SHARED_LIB3) $(SHARED_MEMENVLIB) + $(SHARED_OUTDIR)/$(SHARED_LIB1): $(SHARED_OUTDIR)/$(SHARED_LIB3) + ln -fs $(SHARED_LIB3) $(SHARED_OUTDIR)/$(SHARED_LIB1) + $(SHARED_OUTDIR)/$(SHARED_LIB2): $(SHARED_OUTDIR)/$(SHARED_LIB3) + ln -fs $(SHARED_LIB3) $(SHARED_OUTDIR)/$(SHARED_LIB2) +-SHARED_MEMENVLIB = $(SHARED_OUTDIR)/libmemenv.a ++SHARED_MEMENVLIB = $(SHARED_OUTDIR)/libmemenv.$(PLATFORM_SHARED_EXT).$(SHARED_VERSION_MAJOR).$(SHARED_VERSION_MINOR) + endif -+SHARED += $(MEMENVLIBRARY_SHARED1) $(MEMENVLIBRARY_SHARED2) $(MEMENVLIBRARY_SHARED3) -+MEMENVLIBRARY_SHARED1 = libmemenv.$(PLATFORM_SHARED_EXT) -+MEMENVLIBRARY_SHARED2 = libmemenv.$(PLATFORM_SHARED_EXT).$(SHARED_MAJOR) -+MEMENVLIBRARY_SHARED3 = libmemenv.$(PLATFORM_SHARED_EXT).$(SHARED_MAJOR).$(SHARED_MINOR) -+MEMENVLIBRARY_SHARED = libmemenv.$(PLATFORM_SHARED_EXT).$(SHARED_MAJOR).$(SHARED_MINOR) -+$(MEMENVLIBRARY_SHARED1): $(MEMENVLIBRARY_SHARED3) -+ ln -fs $(MEMENVLIBRARY_SHARED3) $(MEMENVLIBRARY_SHARED1) -+$(MEMENVLIBRARY_SHARED2): $(MEMENVLIBRARY_SHARED3) -+ ln -fs $(MEMENVLIBRARY_SHARED3) $(MEMENVLIBRARY_SHARED2) -+$(MEMENVLIBRARY_SHARED3): -+ $(CXX) $(LDFLAGS) $(PLATFORM_SHARED_LDFLAGS)$(MEMENVLIBRARY_SHARED2) $(CXXFLAGS) $(PLATFORM_SHARED_CFLAGS) $(MEMENV_SOURCES) -o $(MEMENVLIBRARY_SHARED) $(LIBS) -+ - endif # PLATFORM_SHARED_EXT + $(SHARED_OUTDIR)/$(SHARED_LIB3): $(SHARED_LIBOBJECTS) +@@ -293,7 +293,7 @@ endif --all: $(SHARED) $(LIBRARY) -+all: $(SHARED) $(LIBRARY) $(MEMENVLIBRARY) + $(SHARED_MEMENVLIB):$(SHARED_MEMENVOBJECTS) + rm -f $@ +- $(AR) -rs $@ $(SHARED_MEMENVOBJECTS) ++ $(CXX) $(LDFLAGS) $(PLATFORM_SHARED_LDFLAGS)$(basename $(notdir $(SHARED_MEMENVLIB))) $(SHARED_MEMENVOBJECTS) -o $(SHARED_MEMENVLIB) $(LIBS) - check: all $(PROGRAMS) $(TESTS) - for t in $(TESTS); do echo "***** Running $$t"; ./$$t || exit 1; done + $(STATIC_OUTDIR)/db_bench:db/db_bench.cc $(STATIC_LIBOBJECTS) $(TESTUTIL) + $(CXX) $(LDFLAGS) $(CXXFLAGS) db/db_bench.cc $(STATIC_LIBOBJECTS) $(TESTUTIL) -o $@ $(LIBS)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201611191702.uAJH2eJt064094>