diff options
author | Arthur Zamarin <arthurzam@gentoo.org> | 2022-02-04 21:58:45 +0200 |
---|---|---|
committer | Arthur Zamarin <arthurzam@gentoo.org> | 2022-02-04 22:16:41 +0200 |
commit | 5d0bd6ede5c8f6107be8c62ea98ec9aafe79c58a (patch) | |
tree | 6107b9dbcda734809743d4d787a13cedb8b7e133 /dev-libs/leveldb/files | |
parent | sys-kernel/gentoo-kernel-bin: Stabilize 5.4.176 ppc64, #832720 (diff) | |
download | gentoo-5d0bd6ede5c8f6107be8c62ea98ec9aafe79c58a.tar.gz gentoo-5d0bd6ede5c8f6107be8c62ea98ec9aafe79c58a.tar.bz2 gentoo-5d0bd6ede5c8f6107be8c62ea98ec9aafe79c58a.zip |
dev-libs/leveldb: drop 1.20, 1.23-r1
Closes: https://github.com/gentoo/gentoo/pull/12745
Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>
Diffstat (limited to 'dev-libs/leveldb/files')
-rw-r--r-- | dev-libs/leveldb/files/leveldb-1.18-configure.patch | 52 | ||||
-rw-r--r-- | dev-libs/leveldb/files/leveldb-1.20-memenv-so.patch | 33 |
2 files changed, 0 insertions, 85 deletions
diff --git a/dev-libs/leveldb/files/leveldb-1.18-configure.patch b/dev-libs/leveldb/files/leveldb-1.18-configure.patch deleted file mode 100644 index ba30fc731ad5..000000000000 --- a/dev-libs/leveldb/files/leveldb-1.18-configure.patch +++ /dev/null @@ -1,52 +0,0 @@ -we'll handle configure ourselves in src_configure - ---- a/Makefile -+++ b/Makefile -@@ -14,9 +14,6 @@ OPT ?= -O2 -DNDEBUG - # OPT ?= -O2 -g2 -DNDEBUG - #----------------------------------------------- - --# detect what platform we're building on --$(shell CC="$(CC)" CXX="$(CXX)" TARGET_OS="$(TARGET_OS)" \ -- ./build_detect_platform build_config.mk ./) - # this file is generated by the previous line to set build flags and sources - include build_config.mk - - -control snappy/tcmalloc explicitly - ---- a/build_detect_platform -+++ a/build_detect_platform -@@ -190,6 +190,7 @@ - COMMON_FLAGS="$COMMON_FLAGS -DLEVELDB_PLATFORM_POSIX" - fi - -+if [ "${USE_SNAPPY:-auto}" = "auto" ]; then - # Test whether Snappy library is installed - # http://code.google.com/p/snappy/ - $CXX $CXXFLAGS -x c++ - -o $CXXOUTPUT 2>/dev/null <<EOF -@@ -197,15 +198,24 @@ - int main() {} - EOF - if [ "$?" = 0 ]; then -+ USE_SNAPPY="yes" -+ fi -+fi -+ if [ "$USE_SNAPPY" = "yes" ]; then - COMMON_FLAGS="$COMMON_FLAGS -DSNAPPY" - PLATFORM_LIBS="$PLATFORM_LIBS -lsnappy" - fi - -+if [ "${USE_TCMALLOC:-auto}" = "auto" ]; then - # Test whether tcmalloc is available - $CXX $CXXFLAGS -x c++ - -o $CXXOUTPUT -ltcmalloc 2>/dev/null <<EOF - int main() {} - EOF - if [ "$?" = 0 ]; then -+ USE_TCMALLOC="yes" -+ fi -+fi -+ if [ "$USE_TCMALLOC" = "yes" ]; then - PLATFORM_LIBS="$PLATFORM_LIBS -ltcmalloc" - fi - diff --git a/dev-libs/leveldb/files/leveldb-1.20-memenv-so.patch b/dev-libs/leveldb/files/leveldb-1.20-memenv-so.patch deleted file mode 100644 index d443ef0ad262..000000000000 --- a/dev-libs/leveldb/files/leveldb-1.20-memenv-so.patch +++ /dev/null @@ -1,33 +0,0 @@ -# Create libmemenv.so and don't compile programs by default -# Add a static_programs target to compile test programs ---- a/Makefile 2018-06-03 16:52:28.839614213 +0200 -+++ b/Makefile 2018-06-03 16:52:18.209544310 +0200 -@@ -128,15 +128,27 @@ - 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_MEMENV_LIB1 = libmemenv.$(PLATFORM_SHARED_EXT) -+SHARED_MEMENV_LIB2 = $(SHARED_MEMENV_LIB1).$(SHARED_VERSION_MAJOR) -+SHARED_MEMENV_LIB3 = $(SHARED_MEMENV_LIB1).$(SHARED_VERSION_MAJOR).$(SHARED_VERSION_MINOR) -+SHARED_MEMENV_LIBS = $(SHARED_OUTDIR)/$(SHARED_MEMENV_LIB1) $(SHARED_OUTDIR)/$(SHARED_MEMENV_LIB2) $(SHARED_OUTDIR)/$(SHARED_MEMENV_LIB3) -+$(SHARED_OUTDIR)/$(SHARED_MEMENV_LIB1): $(SHARED_OUTDIR)/$(SHARED_MEMENV_LIB3) -+ ln -fs $(SHARED_MEMENV_LIB3) $(SHARED_OUTDIR)/$(SHARED_MEMENV_LIB1) -+$(SHARED_OUTDIR)/$(SHARED_MEMENV_LIB2): $(SHARED_OUTDIR)/$(SHARED_MEMENV_LIB3) -+ ln -fs $(SHARED_MEMENV_LIB3) $(SHARED_OUTDIR)/$(SHARED_MEMENV_LIB2) - SHARED_MEMENVLIB = $(SHARED_OUTDIR)/libmemenv.a - endif - - $(SHARED_OUTDIR)/$(SHARED_LIB3): $(SHARED_LIBOBJECTS) - $(CXX) $(LDFLAGS) $(PLATFORM_SHARED_LDFLAGS)$(SHARED_LIB2) $(SHARED_LIBOBJECTS) -o $(SHARED_OUTDIR)/$(SHARED_LIB3) $(LIBS) -+$(SHARED_OUTDIR)/$(SHARED_MEMENV_LIB3): $(SHARED_MEMENVOBJECTS) -+ $(CXX) $(LDFLAGS) $(PLATFORM_SHARED_LDFLAGS)$(SHARED_MEMENV_LIB2) $(SHARED_MEMENVOBJECTS) -o $(SHARED_OUTDIR)/$(SHARED_MEMENV_LIB3) $(LIBS) - - endif # PLATFORM_SHARED_EXT - --all: $(SHARED_LIBS) $(SHARED_PROGRAMS) $(STATIC_OUTDIR)/libleveldb.a $(STATIC_OUTDIR)/libmemenv.a $(STATIC_PROGRAMS) -+all: $(SHARED_LIBS) $(SHARED_MEMENV_LIBS) -+ -+static_programs: $(STATIC_PROGRAMS) - - check: $(STATIC_PROGRAMS) - for t in $(notdir $(TESTS)); do echo "***** Running $$t"; $(STATIC_OUTDIR)/$$t || exit 1; done |