Skip to content

Commit ca47c05

Browse files
larsewiclaude
larsewi
and
claude
committed
0003-Autoconf-files.patch: Stopped deleting the upstream Makefile
A deletion hunk must match the file byte for byte. Hence, every upstream edit to that Makefile breaks the build. We don't really need to delete the Makefile in the patch. Because, the configure script will replace it anyway. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Signed-off-by: Lars Erik Wik <lars.erik.wik@northern.tech>
1 parent 20eb2f5 commit ca47c05

1 file changed

Lines changed: 1 addition & 186 deletions

File tree

‎deps-packaging/lmdb/0003-Autoconf-files.patch‎

Lines changed: 1 addition & 186 deletions
Original file line numberDiff line numberDiff line change
@@ -4,198 +4,13 @@ Date: Wed, 18 Feb 2015 09:40:20 +0100
44
Subject: [PATCH 03/10] Autoconf files.
55

66
---
7-
libraries/liblmdb/Makefile | 177 ---------------------------------
87
libraries/liblmdb/Makefile.am | 13 ++++
98
libraries/liblmdb/configure.ac | 46 ++++++++++++
109
libraries/liblmdb/mdb.c | 6 ++
11-
4 files changed, 65 insertions(+), 177 deletions(-)
12-
delete mode 100644 libraries/liblmdb/Makefile
10+
3 files changed, 65 insertions(+)
1311
create mode 100644 libraries/liblmdb/Makefile.am
1412
create mode 100644 libraries/liblmdb/configure.ac
1513

16-
diff --git a/libraries/liblmdb/Makefile b/libraries/liblmdb/Makefile
17-
deleted file mode 100644
18-
index 9fd819b..0000000
19-
--- a/Makefile
20-
+++ /dev/null
21-
@@ -1,177 +0,0 @@
22-
-# Makefile for liblmdb (Lightning memory-mapped database library).
23-
-
24-
-########################################################################
25-
-# Configuration. The compiler options must enable threaded compilation.
26-
-#
27-
-# Preprocessor macros (for CPPFLAGS) of interest...
28-
-# Note that the defaults should already be correct for most
29-
-# platforms; you should not need to change any of these.
30-
-# Read their descriptions in mdb.c if you do:
31-
-#
32-
-# - MDB_USE_POSIX_MUTEX, MDB_USE_POSIX_SEM, MDB_USE_SYSV_SEM
33-
-# - MDB_DSYNC
34-
-# - MDB_FDATASYNC
35-
-# - MDB_FDATASYNC_WORKS
36-
-# - MDB_USE_PWRITEV
37-
-# - MDB_USE_ROBUST
38-
-#
39-
-# There may be other macros in mdb.c of interest. You should
40-
-# read mdb.c before changing any of them.
41-
-#
42-
-CC = gcc
43-
-AR = ar
44-
-W = -W -Wall -Wno-unused-parameter -Wbad-function-cast -Wuninitialized
45-
-THREADS = -pthread
46-
-OPT = -O2 -g
47-
-CFLAGS = $(THREADS) $(OPT) $(W) $(XCFLAGS)
48-
-LDFLAGS = $(THREADS)
49-
-LDLIBS =
50-
-SOLIBS =
51-
-SOEXT = .so
52-
-LDL = -ldl
53-
-
54-
-LIBVER = 1
55-
-ABIVER = 0
56-
-VEREXT = $(LIBVER).$(ABIVER)
57-
-LMDB_VERSION = 1.0.0
58-
-SOFULL = $(SOEXT).$(VEREXT)
59-
-
60-
-prefix = /usr/local
61-
-exec_prefix = $(prefix)
62-
-bindir = $(exec_prefix)/bin
63-
-libdir = $(exec_prefix)/lib
64-
-includedir = $(prefix)/include
65-
-datarootdir = $(prefix)/share
66-
-mandir = $(datarootdir)/man
67-
-
68-
-########################################################################
69-
-
70-
-IHDRS = lmdb.h
71-
-ILIBS = liblmdb.a
72-
-ILIBS2 = liblmdb$(SOFULL)
73-
-IPROGS = mdb_stat mdb_copy mdb_dump mdb_load mdb_drop
74-
-IDOCS = mdb_stat.1 mdb_copy.1 mdb_dump.1 mdb_load.1 mdb_drop.1
75-
-PROGS = $(IPROGS) mtest mtest2 mtest3 mtest4 mtest5
76-
-RPROGS = mtest_remap mtest_enc mtest_enc2
77-
-SOVER = liblmdb$(SOEXT).$(LIBVER)
78-
-VERSION_OPT = -Wl,-soname,$(SOVER)
79-
-# For MacOSX:
80-
-#VERSION_OPT = -Wl,-current_version,$(VEREXT)
81-
-
82-
-all: $(ILIBS) $(ILIBS2) $(PROGS) lmdb.pc
83-
-# Requires CPPFLAGS=-DMDB_VL32 and/or -DMDB_RPAGE_CACHE
84-
-rall: all $(RPROGS)
85-
-
86-
-install: $(ILIBS) $(IPROGS) $(IHDRS)
87-
- mkdir -p $(DESTDIR)$(bindir)
88-
- mkdir -p $(DESTDIR)$(libdir)
89-
- mkdir -p $(DESTDIR)$(includedir)
90-
- mkdir -p $(DESTDIR)$(mandir)/man1
91-
- for f in $(IPROGS); do cp $$f $(DESTDIR)$(bindir); done
92-
- for f in $(ILIBS); do cp $$f $(DESTDIR)$(libdir); done
93-
- for f in $(ILIBS2); do cp $$f $(DESTDIR)$(libdir); \
94-
- i=`basename -s .$(ABIVER) $$f`; rm -f $(DESTDIR)$(libdir)/$$i; \
95-
- ln -s $$f $(DESTDIR)$(libdir)/$$i; \
96-
- i=`basename -s .$(LIBVER) $$i`; rm -f $(DESTDIR)$(libdir)/$$i; \
97-
- ln -s $$f $(DESTDIR)$(libdir)/$$i; done
98-
- for f in $(IHDRS); do cp $$f $(DESTDIR)$(includedir); done
99-
- for f in $(IDOCS); do cp $$f $(DESTDIR)$(mandir)/man1; done
100-
-
101-
-clean:
102-
- rm -rf $(PROGS) $(RPROGS) *.[ao] *.[ls]o *.so.* *~ testdb
103-
-
104-
-test: all
105-
- rm -rf testdb && mkdir testdb
106-
- ./mtest && ./mdb_stat testdb
107-
-
108-
-liblmdb.a: mdb.o midl.o module.o
109-
- $(AR) rs $@ mdb.o midl.o module.o
110-
-
111-
-liblmdb$(SOFULL): mdb.lo midl.lo module.lo
112-
-# $(CC) $(LDFLAGS) -pthread -shared -Wl,-Bsymbolic -o $@ mdb.o midl.o $(SOLIBS)
113-
- $(CC) $(LDFLAGS) -shared $(VERSION_OPT) -o $@ mdb.lo midl.lo module.lo $(SOLIBS) $(LDL)
114-
- rm -f liblmdb$(SOEXT); ln -s $@ liblmdb$(SOEXT)
115-
- rm -f $(SOVER); ln -s $@ $(SOVER)
116-
-
117-
-mdb_stat: mdb_stat.o liblmdb.a
118-
- $(CC) $(LDFLAGS) -o $@ $^ $(LDL)
119-
-mdb_copy: mdb_copy.o liblmdb.a
120-
- $(CC) $(LDFLAGS) -o $@ $^ $(LDL)
121-
-mdb_dump: mdb_dump.o liblmdb.a
122-
- $(CC) $(LDFLAGS) -o $@ $^ $(LDL)
123-
-mdb_load: mdb_load.o liblmdb.a
124-
- $(CC) $(LDFLAGS) -o $@ $^ $(LDL)
125-
-mdb_drop: mdb_drop.o liblmdb.a
126-
- $(CC) $(LDFLAGS) -o $@ $^ $(LDL)
127-
-mtest: mtest.o liblmdb.a
128-
-mtest2: mtest2.o liblmdb.a
129-
-mtest3: mtest3.o liblmdb.a
130-
-mtest4: mtest4.o liblmdb.a
131-
-mtest5: mtest5.o liblmdb.a
132-
-mtest6: mtest6.o liblmdb.a
133-
-mtest_remap: mtest_remap.o liblmdb.a
134-
-mtest_enc: mtest_enc.o chacha8.o liblmdb.a
135-
-mtest_enc2: mtest_enc2.o liblmdb.a crypto.lm
136-
- $(CC) $(LDFLAGS) -pthread -o $@ $@.o liblmdb.a $(LDL)
137-
-mtest_enc3: mtest_enc3.o liblmdb.a crypto.lm
138-
- $(CC) $(LDFLAGS) -pthread -o $@ $@.o liblmdb.a $(LDL)
139-
-mtest_enc4: mtest_enc4.o liblmdb.a crypto.lm
140-
- $(CC) $(LDFLAGS) -pthread -o $@ $@.o liblmdb.a $(LDL)
141-
-
142-
-mplay: mplay.o liblmdb.a
143-
-
144-
-crypto.lm: crypto.c
145-
- $(CC) -shared $(CFLAGS) -o $@ $^ -lsodium
146-
-
147-
-mdb.o: mdb.c lmdb.h midl.h
148-
- $(CC) $(CFLAGS) $(CPPFLAGS) -c mdb.c
149-
-
150-
-midl.o: midl.c midl.h
151-
- $(CC) $(CFLAGS) $(CPPFLAGS) -c midl.c
152-
-
153-
-mdb.lo: mdb.c lmdb.h midl.h
154-
- $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) -c mdb.c -o $@
155-
-
156-
-midl.lo: midl.c midl.h
157-
- $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) -c midl.c -o $@
158-
-
159-
-module.lo: module.c lmdb.h
160-
- $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) -c module.c -o $@
161-
-
162-
-%: %.o
163-
- $(CC) $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) -o $@
164-
-
165-
-%.o: %.c lmdb.h
166-
- $(CC) $(CFLAGS) $(CPPFLAGS) -c $<
167-
-
168-
-lmdb.pc: Makefile
169-
- @echo "prefix=$(prefix)" > $@
170-
- @echo "exec_prefix=$(exec_prefix)" >>$@
171-
- @echo "includedir=$(includedir)" >>$@
172-
- @echo "libdir=$(libdir)" >>$@
173-
- @echo >>$@
174-
- @echo "Name: lmdb (OpenLDAP)" >>$@
175-
- @echo "Description: OpenLDAP Lightning Memory Mapped Database library" >>$@
176-
- @echo "URL: https://www.openldap.org" >>$@
177-
- @echo "Version: $(LMDB_VERSION)" >>$@
178-
- @echo "Cflags: $(THREADS) $(XCFLAGS)" >>$@
179-
- @echo "Libs: -llmdb $(LDL) $(THREADS)" >>$@
180-
-
181-
-COV_FLAGS=-fprofile-arcs -ftest-coverage
182-
-COV_OBJS=xmdb.o xmidl.o
183-
-
184-
-coverage: xmtest
185-
- for i in mtest*.c [0-9]*.c; do j=`basename \$$i .c`; $(MAKE) $$j.o; \
186-
- gcc -o x$$j $$j.o $(COV_OBJS) -pthread $(COV_FLAGS); \
187-
- rm -rf testdb; mkdir testdb; ./x$$j; done
188-
- gcov xmdb.c
189-
- gcov xmidl.c
190-
-
191-
-xmtest: mtest.o xmdb.o xmidl.o
192-
- gcc -o xmtest mtest.o xmdb.o xmidl.o -pthread $(COV_FLAGS)
193-
-
194-
-xmdb.o: mdb.c lmdb.h midl.h
195-
- $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) -O0 $(COV_FLAGS) -c mdb.c -o $@
196-
-
197-
-xmidl.o: midl.c midl.h
198-
- $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) -O0 $(COV_FLAGS) -c midl.c -o $@
19914
diff --git a/libraries/liblmdb/Makefile.am b/libraries/liblmdb/Makefile.am
20015
new file mode 100644
20116
index 0000000..e331a15

0 commit comments

Comments
 (0)