Date: Fri, 19 Apr 2019 23:25:49 +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: r499394 - in head/databases/leveldb: . files Message-ID: <201904192325.x3JNPn7U021423@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sunpoet Date: Fri Apr 19 23:25:49 2019 New Revision: 499394 URL: https://svnweb.freebsd.org/changeset/ports/499394 Log: Update to 1.21 Changes: https://github.com/google/leveldb/releases Added: head/databases/leveldb/files/patch-CMakeLists.txt (contents, props changed) Deleted: head/databases/leveldb/files/patch-Makefile head/databases/leveldb/files/patch-build_detect_platform Modified: head/databases/leveldb/Makefile head/databases/leveldb/distinfo head/databases/leveldb/pkg-plist Modified: head/databases/leveldb/Makefile ============================================================================== --- head/databases/leveldb/Makefile Fri Apr 19 23:20:27 2019 (r499393) +++ head/databases/leveldb/Makefile Fri Apr 19 23:25:49 2019 (r499394) @@ -2,9 +2,7 @@ # $FreeBSD$ PORTNAME= leveldb -PORTVERSION= 1.20 -DISTVERSIONPREFIX= v -PORTREVISION= 4 +PORTVERSION= 1.21 CATEGORIES= databases MAINTAINER= sunpoet@FreeBSD.org @@ -15,13 +13,12 @@ LICENSE= BSD3CLAUSE OPTIONS_DEFINE= GPERFTOOLS SNAPPY OPTIONS_DEFAULT=SNAPPY -CONFIGURE_ARGS= build_config.mk ${WRKSRC}/ -CONFIGURE_SCRIPT= build_detect_platform -HAS_CONFIGURE= yes -MAKE_JOBS_UNSAFE= yes -TEST_TARGET= check +USES= cmake compiler:c++11-lang localbase + +CMAKE_OFF= LEVELDB_BUILD_TESTS +CMAKE_ON= BUILD_SHARED_LIBS LEVELDB_BUILD_BENCHMARKS LEVELDB_INSTALL +USE_CXXSTD= c++11 USE_LDCONFIG= yes -USES= compiler:c++0x gmake localbase PLIST_SUB= SHLIB_MAJOR=${SHLIB_MAJOR} \ SHLIB_MINOR=${SHLIB_MINOR} @@ -34,38 +31,18 @@ USE_GITHUB= yes GPERFTOOLS_LIB_DEPENDS= libtcmalloc.so:devel/google-perftools SNAPPY_LIB_DEPENDS= libsnappy.so:archivers/snappy +SNAPPY_VARS= SNAPPY=1 SNAPPY_CFLAGS=-DSNAPPY +SNAPPY_VARS_OFF= SNAPPY=0 SNAPPY_CFLAGS= post-patch: - @${REINPLACE_CMD} -e '/PLATFORM_IS_LITTLE_ENDIAN/ s|__|_|g' ${WRKSRC}/port/port_posix.h + @${REINPLACE_CMD} -e 's|%%SHLIB_MAJOR%%|${SHLIB_MAJOR}|; s|%%SHLIB_MINOR%%|${SHLIB_MINOR}|' ${WRKSRC}/CMakeLists.txt -post-patch-GPERFTOOLS-off: - @${REINPLACE_CMD} -e 's| -ltcmalloc||' ${WRKSRC}/build_detect_platform - -post-patch-SNAPPY-off: - @${REINPLACE_CMD} -e 's| -DSNAPPY||; s| -lsnappy||' ${WRKSRC}/build_detect_platform - +post-install: + ${AR} cq ${STAGEDIR}${PREFIX}/lib/libleveldb.a ${BUILD_WRKSRC}/CMakeFiles/leveldb.dir/*/*.o # backward compatibility (for databases/p5-Tie-LevelDB) -pre-install-SNAPPY-off: - ${ECHO_CMD} "SNAPPY=0" >> ${WRKSRC}/build_config.mk - -pre-install-SNAPPY-on: - ${ECHO_CMD} "SNAPPY=1" >> ${WRKSRC}/build_config.mk - -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_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 - ${LN} -fs libmemenv.so.${SHLIB_MAJOR}.${SHLIB_MINOR} ${STAGEDIR}${PREFIX}/lib/libmemenv.so.${SHLIB_MAJOR} -# backward compatibility (for databases/p5-Tie-LevelDB) - ${GREP} '^PLATFORM_CXXFLAGS=' ${WRKSRC}/build_config.mk | ${SED} 's|PLATFORM_CXXFLAGS|PORT_CFLAGS|' >> ${WRKSRC}/build_config.mk - ${GREP} '^PLATFORM_CXXFLAGS=' ${WRKSRC}/build_config.mk | ${SED} 's|PLATFORM_CXXFLAGS|PLATFORM_CFLAGS|' >> ${WRKSRC}/build_config.mk - ${INSTALL_DATA} ${WRKSRC}/build_config.mk ${STAGEDIR}${DATADIR}/ + ${MKDIR} ${STAGEDIR}${DATADIR}/ + ${ECHO_CMD} "PLATFORM_CFLAGS=-std=c++11 -D_REENTRANT -DOS_FREEBSD -DLEVELDB_PLATFORM_POSIX ${SNAPPY_CFLAGS}" > ${STAGEDIR}${DATADIR}/build_config.mk + ${ECHO_CMD} "PORT_CFLAGS=-std=c++11 -D_REENTRANT -DOS_FREEBSD -DLEVELDB_PLATFORM_POSIX ${SNAPPY_CFLAGS}" >> ${STAGEDIR}${DATADIR}/build_config.mk + ${ECHO_CMD} "SNAPPY=${SNAPPY}" >> ${STAGEDIR}${DATADIR}/build_config.mk .include <bsd.port.mk> Modified: head/databases/leveldb/distinfo ============================================================================== --- head/databases/leveldb/distinfo Fri Apr 19 23:20:27 2019 (r499393) +++ head/databases/leveldb/distinfo Fri Apr 19 23:25:49 2019 (r499394) @@ -1,3 +1,3 @@ -TIMESTAMP = 1488462981 -SHA256 (google-leveldb-v1.20_GH0.tar.gz) = f5abe8b5b209c2f36560b75f32ce61412f39a2922f7045ae764a2c23335b6664 -SIZE (google-leveldb-v1.20_GH0.tar.gz) = 223141 +TIMESTAMP = 1553965140 +SHA256 (google-leveldb-1.21_GH0.tar.gz) = e0fbd238047b9e82ec26a2b808f826b60e12b4fcb5d1a18c7b3d6edf357b4026 +SIZE (google-leveldb-1.21_GH0.tar.gz) = 236979 Added: head/databases/leveldb/files/patch-CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/leveldb/files/patch-CMakeLists.txt Fri Apr 19 23:25:49 2019 (r499394) @@ -0,0 +1,14 @@ +--- CMakeLists.txt.orig 2019-03-29 21:37:39 UTC ++++ CMakeLists.txt +@@ -228,6 +228,11 @@ if (NOT HAVE_CXX17_HAS_INCLUDE) + endif(NOT HAVE_CXX17_HAS_INCLUDE) + + if(BUILD_SHARED_LIBS) ++ set_target_properties(leveldb ++ PROPERTIES ++ VERSION %%SHLIB_MAJOR%%.%%SHLIB_MINOR%% ++ SOVERSION %%SHLIB_MAJOR%% ++ ) + target_compile_definitions(leveldb + PUBLIC + # Used by include/export.h. Modified: head/databases/leveldb/pkg-plist ============================================================================== --- head/databases/leveldb/pkg-plist Fri Apr 19 23:20:27 2019 (r499393) +++ head/databases/leveldb/pkg-plist Fri Apr 19 23:25:49 2019 (r499394) @@ -4,6 +4,7 @@ include/leveldb/comparator.h include/leveldb/db.h include/leveldb/dumpfile.h include/leveldb/env.h +include/leveldb/export.h include/leveldb/filter_policy.h include/leveldb/iterator.h include/leveldb/options.h @@ -12,13 +13,12 @@ include/leveldb/status.h include/leveldb/table.h include/leveldb/table_builder.h include/leveldb/write_batch.h -include/memenv/memenv.h +lib/cmake/leveldb/leveldbConfig.cmake +lib/cmake/leveldb/leveldbConfigVersion.cmake +lib/cmake/leveldb/leveldbTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/leveldb/leveldbTargets.cmake lib/libleveldb.a lib/libleveldb.so lib/libleveldb.so.%%SHLIB_MAJOR%% lib/libleveldb.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%% -lib/libmemenv.a -lib/libmemenv.so -lib/libmemenv.so.%%SHLIB_MAJOR%% -lib/libmemenv.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%% %%DATADIR%%/build_config.mk
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201904192325.x3JNPn7U021423>