pool/lmdb
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1287678211
lmdb/Makefile-build-use-shared-lib.patch

125 lines
3.9 KiB
Diff
Raw Normal View History

Accepting request 613819 from home:StefanBruens:branches:openSUSE:Factory - LMDB 0.9.22 Release (2018-03-22) * Fix MDB_DUPSORT alignment bug (ITS#8819) * Fix regression with new db from 0.9.19 (ITS#8760) * Fix liblmdb to build on Solaris (ITS#8612) * Fix delete behavior with DUPSORT DB (ITS#8622) * Fix mdb_cursor_get/mdb_cursor_del behavior (ITS#8722) - LMDB 0.9.21 Release (2017/06/01) * Fix xcursor after cursor_del (ITS#8622) - LMDB 0.9.20 (Withdrawn) * Fix mdb_load with escaped plaintext (ITS#8558) * Fix mdb_cursor_last / mdb_put interaction (ITS#8557) - LMDB 0.9.19 Release (2016/12/28) * Fix mdb_env_cwalk cursor init (ITS#8424) * Fix robust mutexes on Solaris 10/11 (ITS#8339) * Tweak Win32 error message buffer * Fix MDB_GET_BOTH on non-dup record (ITS#8393) * Optimize mdb_drop * Fix xcursors after mdb_cursor_del (ITS#8406) * Fix MDB_NEXT_DUP after mdb_cursor_del (ITS#8412) * Fix mdb_cursor_put resetting C_EOF (ITS#8489) * Fix mdb_env_copyfd2 to return EPIPE on SIGPIPE (ITS#8504) * Fix mdb_env_copy with empty DB (ITS#8209) * Fix behaviors with fork (ITS#8505) * Fix mdb_dbi_open with mainDB cursors (ITS#8542) * Fix robust mutexes on kFreeBSD (ITS#8554) * Fix utf8_to_utf16 error checks (ITS#7992) * Fix F_NOCACHE on MacOS, error is non-fatal (ITS#7682) * Build Make shared lib suffix overridable (ITS#8481) * Documentation + Cleanup doxygen nits + Note reserved vs actual mem/disk usage - LMDB 0.9.18 Release (2016/02/05) * Fix robust mutex detection on glibc 2.10-11 (ITS#8330) * Fix page_search_root assert on FreeDB (ITS#8336) * Fix MDB_APPENDDUP vs. rewrite(single item) (ITS#8334) * Fix mdb_copy of large files on Windows * Fix subcursor move after delete (ITS#8355) * Fix mdb_midl_shirnk off-by-one (ITS#8363) * Check for utf8_to_utf16 failures (ITS#7992) * Catch strdup failure in mdb_dbi_open * Build + Additional makefile var tweaks (ITS#8169) * Documentation + Add Getting Started page + Update WRITEMAP description - Drop 0002-Autoconf-files.patch, soname-configurable.patch and add Makefile-build-use-shared-lib.patch instead. Instead of replacing the Makefile with a libtool/automake based one, just patch the relevant parts of the upstream Makefile. OBS-URL: https://build.opensuse.org/request/show/613819 OBS-URL: https://build.opensuse.org/package/show/systemsmanagement/lmdb?expand=0&rev=27
2018-06-04 09:07:20 +02:00
From 3e19339d0d22c76ac0fd17f1a59ca2ae1c03f93a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
Date: Sun, 3 Jun 2018 23:49:29 +0200
Subject: [PATCH 1/3] Set SONAME in shared lib
---
libraries/liblmdb/Makefile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/libraries/liblmdb/Makefile b/libraries/liblmdb/Makefile
index f254511f1..489a08976 100644
--- a/libraries/liblmdb/Makefile
+++ b/libraries/liblmdb/Makefile
@@ -38,7 +38,7 @@ mandir = $(datarootdir)/man
########################################################################
IHDRS = lmdb.h
-ILIBS = liblmdb.a liblmdb$(SOEXT)
+ILIBS = liblmdb-$(SOVERSION)$(SOEXT)
IPROGS = mdb_stat mdb_copy mdb_dump mdb_load
IDOCS = mdb_stat.1 mdb_copy.1 mdb_dump.1 mdb_load.1
PROGS = $(IPROGS) mtest mtest2 mtest3 mtest4 mtest5
@@ -64,9 +64,9 @@ test: all
liblmdb.a: mdb.o midl.o
$(AR) rs $@ mdb.o midl.o
-liblmdb$(SOEXT): mdb.lo midl.lo
+liblmdb-$(SOVERSION)$(SOEXT): mdb.lo midl.lo
# $(CC) $(LDFLAGS) -pthread -shared -Wl,-Bsymbolic -o $@ mdb.o midl.o $(SOLIBS)
- $(CC) $(LDFLAGS) -pthread -shared -o $@ mdb.lo midl.lo $(SOLIBS)
+ $(CC) $(LDFLAGS) -pthread -shared -o $@ mdb.lo midl.lo $(SOLIBS) -Wl,-soname -Wl,liblmdb-$(SOVERSION).so
mdb_stat: mdb_stat.o liblmdb.a
mdb_copy: mdb_copy.o liblmdb.a
--
2.17.0
From e4e77f24f0b45c308e4f774c67281d38dee0b060 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
Date: Sun, 3 Jun 2018 23:52:16 +0200
Subject: [PATCH 2/3] Use shared library
---
libraries/liblmdb/Makefile | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/libraries/liblmdb/Makefile b/libraries/liblmdb/Makefile
index 489a08976..d926df798 100644
--- a/libraries/liblmdb/Makefile
+++ b/libraries/liblmdb/Makefile
@@ -68,16 +68,16 @@ liblmdb-$(SOVERSION)$(SOEXT): mdb.lo midl.lo
# $(CC) $(LDFLAGS) -pthread -shared -Wl,-Bsymbolic -o $@ mdb.o midl.o $(SOLIBS)
$(CC) $(LDFLAGS) -pthread -shared -o $@ mdb.lo midl.lo $(SOLIBS) -Wl,-soname -Wl,liblmdb-$(SOVERSION).so
-mdb_stat: mdb_stat.o liblmdb.a
-mdb_copy: mdb_copy.o liblmdb.a
-mdb_dump: mdb_dump.o liblmdb.a
-mdb_load: mdb_load.o liblmdb.a
-mtest: mtest.o liblmdb.a
-mtest2: mtest2.o liblmdb.a
-mtest3: mtest3.o liblmdb.a
-mtest4: mtest4.o liblmdb.a
-mtest5: mtest5.o liblmdb.a
-mtest6: mtest6.o liblmdb.a
+mdb_stat: mdb_stat.o
+mdb_copy: mdb_copy.o
+mdb_dump: mdb_dump.o
+mdb_load: mdb_load.o
+mtest: mtest.o
+mtest2: mtest2.o
+mtest3: mtest3.o
+mtest4: mtest4.o
+mtest5: mtest5.o
+mtest6: mtest6.o
mdb.o: mdb.c lmdb.h midl.h
$(CC) $(CFLAGS) $(CPPFLAGS) -c mdb.c
@@ -91,8 +91,8 @@ mdb.lo: mdb.c lmdb.h midl.h
midl.lo: midl.c midl.h
$(CC) $(CFLAGS) -fPIC $(CPPFLAGS) -c midl.c -o $@
-%: %.o
- $(CC) $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) -o $@
+%: %.o | liblmdb-$(SOVERSION)$(SOEXT)
+ $(CC) $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) -L. -llmdb-$(SOVERSION) -o $@
%.o: %.c lmdb.h
$(CC) $(CFLAGS) $(CPPFLAGS) -c $<
--
2.17.0
From 85810167f7db0091e0937e5fb464f7f7868d36a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
Date: Sun, 3 Jun 2018 23:52:43 +0200
Subject: [PATCH 3/3] Build/install CFEngine extra tools
---
libraries/liblmdb/Makefile | 3 +++
1 file changed, 3 insertions(+)
diff --git a/libraries/liblmdb/Makefile b/libraries/liblmdb/Makefile
index d926df798..b2e95a642 100644
--- a/libraries/liblmdb/Makefile
+++ b/libraries/liblmdb/Makefile
@@ -40,6 +40,7 @@ mandir = $(datarootdir)/man
IHDRS = lmdb.h
ILIBS = liblmdb-$(SOVERSION)$(SOEXT)
IPROGS = mdb_stat mdb_copy mdb_dump mdb_load
+IPROGS += lmdump lmmgr
IDOCS = mdb_stat.1 mdb_copy.1 mdb_dump.1 mdb_load.1
PROGS = $(IPROGS) mtest mtest2 mtest3 mtest4 mtest5
all: $(ILIBS) $(PROGS)
@@ -78,6 +79,8 @@ mtest3: mtest3.o
mtest4: mtest4.o
mtest5: mtest5.o
mtest6: mtest6.o
+lmmgr: lmmgr.o
+lmdump: lmdump.o
mdb.o: mdb.c lmdb.h midl.h
$(CC) $(CFLAGS) $(CPPFLAGS) -c mdb.c
--
2.17.0
Reference in New Issue Copy Permalink