Sun Mar 15 21:01:47 2020 UTC ()
lmdb: fix a patch: rearrange linker parameter order & drop useless -R flag


(tnn)
diff -r1.8 -r1.9 pkgsrc/databases/lmdb/distinfo
diff -r1.4 -r1.5 pkgsrc/databases/lmdb/patches/patch-libraries_liblmdb_Makefile
cvs diff -r1.8 -r1.9 pkgsrc/databases/lmdb/distinfo (expand / switch to unified diff)

--- pkgsrc/databases/lmdb/distinfo 2020/02/13 14:15:26 1.8
+++ pkgsrc/databases/lmdb/distinfo 2020/03/15 21:01:47 1.9
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.8 2020/02/13 14:15:26 mef Exp $ 1$NetBSD: distinfo,v 1.9 2020/03/15 21:01:47 tnn Exp $
2 2
3SHA1 (openldap-2.4.49.tgz) = f0caeca122e6f90e6ac5cc8ba36fe9cec13826da 3SHA1 (openldap-2.4.49.tgz) = f0caeca122e6f90e6ac5cc8ba36fe9cec13826da
4RMD160 (openldap-2.4.49.tgz) = c09ca490e1f815e2aea799b1edd340e904233ea0 4RMD160 (openldap-2.4.49.tgz) = c09ca490e1f815e2aea799b1edd340e904233ea0
5SHA512 (openldap-2.4.49.tgz) = 99d1943d126b06e62865e31e5825fcff2cb15415f7f85ae4962fa0e7425bc3b58db5b9639150d7b09e3642c80257724c745e47c25ab4fcb1bba0ba771011dd49 5SHA512 (openldap-2.4.49.tgz) = 99d1943d126b06e62865e31e5825fcff2cb15415f7f85ae4962fa0e7425bc3b58db5b9639150d7b09e3642c80257724c745e47c25ab4fcb1bba0ba771011dd49
6Size (openldap-2.4.49.tgz) = 5704723 bytes 6Size (openldap-2.4.49.tgz) = 5704723 bytes
7SHA1 (patch-libraries_liblmdb_Makefile) = 6b2f0bb477b17b073095d499ff4496f3b30dc08f 7SHA1 (patch-libraries_liblmdb_Makefile) = 4dd8ed43169e5615b416e7e0696dd3b16e784282
cvs diff -r1.4 -r1.5 pkgsrc/databases/lmdb/patches/patch-libraries_liblmdb_Makefile (expand / switch to unified diff)

--- pkgsrc/databases/lmdb/patches/patch-libraries_liblmdb_Makefile 2018/12/20 17:55:24 1.4
+++ pkgsrc/databases/lmdb/patches/patch-libraries_liblmdb_Makefile 2020/03/15 21:01:47 1.5
@@ -1,40 +1,40 @@ @@ -1,40 +1,40 @@
1$NetBSD: patch-libraries_liblmdb_Makefile,v 1.4 2018/12/20 17:55:24 adam Exp $ 1$NetBSD: patch-libraries_liblmdb_Makefile,v 1.5 2020/03/15 21:01:47 tnn Exp $
2 2
3Use proper install commands. 3Use proper install commands.
4 4
5--- libraries/liblmdb/Makefile.orig 2018-12-19 15:57:06.000000000 +0000 5--- libraries/liblmdb/Makefile.orig 2020-01-30 17:58:35.000000000 +0000
6+++ libraries/liblmdb/Makefile 6+++ libraries/liblmdb/Makefile
7@@ -49,10 +49,10 @@ install: $(ILIBS) $(IPROGS) $(IHDRS) 7@@ -49,10 +49,10 @@ install: $(ILIBS) $(IPROGS) $(IHDRS)
8 mkdir -p $(DESTDIR)$(libdir) 8 mkdir -p $(DESTDIR)$(libdir)
9 mkdir -p $(DESTDIR)$(includedir) 9 mkdir -p $(DESTDIR)$(includedir)
10 mkdir -p $(DESTDIR)$(mandir)/man1 10 mkdir -p $(DESTDIR)$(mandir)/man1
11- for f in $(IPROGS); do cp $$f $(DESTDIR)$(bindir); done 11- for f in $(IPROGS); do cp $$f $(DESTDIR)$(bindir); done
12- for f in $(ILIBS); do cp $$f $(DESTDIR)$(libdir); done 12- for f in $(ILIBS); do cp $$f $(DESTDIR)$(libdir); done
13- for f in $(IHDRS); do cp $$f $(DESTDIR)$(includedir); done 13- for f in $(IHDRS); do cp $$f $(DESTDIR)$(includedir); done
14- for f in $(IDOCS); do cp $$f $(DESTDIR)$(mandir)/man1; done 14- for f in $(IDOCS); do cp $$f $(DESTDIR)$(mandir)/man1; done
15+ for f in $(IPROGS); do $(BSD_INSTALL_PROGRAM) $$f $(DESTDIR)$(prefix)/bin; done 15+ for f in $(IPROGS); do $(BSD_INSTALL_PROGRAM) $$f $(DESTDIR)$(prefix)/bin; done
16+ for f in $(ILIBS); do $(BSD_INSTALL_LIB) $$f $(DESTDIR)$(prefix)/lib; done 16+ for f in $(ILIBS); do $(BSD_INSTALL_LIB) $$f $(DESTDIR)$(prefix)/lib; done
17+ for f in $(IHDRS); do $(BSD_INSTALL_DATA) $$f $(DESTDIR)$(prefix)/include; done 17+ for f in $(IHDRS); do $(BSD_INSTALL_DATA) $$f $(DESTDIR)$(prefix)/include; done
18+ for f in $(IDOCS); do $(BSD_INSTALL_MAN) $$f $(DESTDIR)$(prefix)/$(PKGMANDIR)/man1; done 18+ for f in $(IDOCS); do $(BSD_INSTALL_MAN) $$f $(DESTDIR)$(prefix)/$(PKGMANDIR)/man1; done
19  19
20 clean: 20 clean:
21 rm -rf $(PROGS) *.[ao] *.[ls]o *~ testdb 21 rm -rf $(PROGS) *.[ao] *.[ls]o *~ testdb
22@@ -68,10 +68,14 @@ liblmdb$(SOEXT): mdb.lo midl.lo 22@@ -68,10 +68,14 @@ liblmdb$(SOEXT): mdb.lo midl.lo
23 # $(CC) $(LDFLAGS) -pthread -shared -Wl,-Bsymbolic -o $@ mdb.o midl.o $(SOLIBS) 23 # $(CC) $(LDFLAGS) -pthread -shared -Wl,-Bsymbolic -o $@ mdb.o midl.o $(SOLIBS)
24 $(CC) $(LDFLAGS) -pthread -shared -o $@ mdb.lo midl.lo $(SOLIBS) 24 $(CC) $(LDFLAGS) -pthread -shared -o $@ mdb.lo midl.lo $(SOLIBS)
25  25
26-mdb_stat: mdb_stat.o liblmdb.a 26-mdb_stat: mdb_stat.o liblmdb.a
27-mdb_copy: mdb_copy.o liblmdb.a 27-mdb_copy: mdb_copy.o liblmdb.a
28-mdb_dump: mdb_dump.o liblmdb.a 28-mdb_dump: mdb_dump.o liblmdb.a
29-mdb_load: mdb_load.o liblmdb.a 29-mdb_load: mdb_load.o liblmdb.a
30+mdb_stat: mdb_stat.o liblmdb${SOEXT} 30+mdb_stat: mdb_stat.o liblmdb${SOEXT}
31+ $(CC) $(LDFLAGS) -L. -Wl,-R. -llmdb -o $@ $< 31+ $(CC) $(LDFLAGS) $< -L. -llmdb -o $@
32+mdb_copy: mdb_copy.o liblmdb${SOEXT} 32+mdb_copy: mdb_copy.o liblmdb${SOEXT}
33+ $(CC) $(LDFLAGS) -L. -Wl,-R. -llmdb -o $@ $< 33+ $(CC) $(LDFLAGS) $< -L. -llmdb -o $@
34+mdb_dump: mdb_dump.o liblmdb${SOEXT} 34+mdb_dump: mdb_dump.o liblmdb${SOEXT}
35+ $(CC) $(LDFLAGS) -L. -Wl,-R. -llmdb -o $@ $< 35+ $(CC) $(LDFLAGS) $< -L. -llmdb -o $@
36+mdb_load: mdb_load.o liblmdb${SOEXT} 36+mdb_load: mdb_load.o liblmdb${SOEXT}
37+ $(CC) $(LDFLAGS) -L. -Wl,-R. -llmdb -o $@ $< 37+ $(CC) $(LDFLAGS) $< -L. -llmdb -o $@
38 mtest: mtest.o liblmdb.a 38 mtest: mtest.o liblmdb.a
39 mtest2: mtest2.o liblmdb.a 39 mtest2: mtest2.o liblmdb.a
40 mtest3: mtest3.o liblmdb.a 40 mtest3: mtest3.o liblmdb.a