CVS commit: pkgsrc/databases/lmdb

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sun Mar 15 21:01:47 UTC 2020

Modified Files:
        pkgsrc/databases/lmdb: distinfo
        pkgsrc/databases/lmdb/patches: patch-libraries_liblmdb_Makefile

Log Message:
lmdb: fix a patch: rearrange linker parameter order & drop useless -R flag


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/databases/lmdb/distinfo
cvs rdiff -u -r1.4 -r1.5 \
    pkgsrc/databases/lmdb/patches/patch-libraries_liblmdb_Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/lmdb/distinfo
diff -u pkgsrc/databases/lmdb/distinfo:1.8 pkgsrc/databases/lmdb/distinfo:1.9
--- pkgsrc/databases/lmdb/distinfo:1.8  Thu Feb 13 14:15:26 2020
+++ pkgsrc/databases/lmdb/distinfo      Sun Mar 15 21:01:47 2020
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.8 2020/02/13 14:15:26 mef Exp $
+$NetBSD: distinfo,v 1.9 2020/03/15 21:01:47 tnn Exp $
 
 SHA1 (openldap-2.4.49.tgz) = f0caeca122e6f90e6ac5cc8ba36fe9cec13826da
 RMD160 (openldap-2.4.49.tgz) = c09ca490e1f815e2aea799b1edd340e904233ea0
 SHA512 (openldap-2.4.49.tgz) = 99d1943d126b06e62865e31e5825fcff2cb15415f7f85ae4962fa0e7425bc3b58db5b9639150d7b09e3642c80257724c745e47c25ab4fcb1bba0ba771011dd49
 Size (openldap-2.4.49.tgz) = 5704723 bytes
-SHA1 (patch-libraries_liblmdb_Makefile) = 6b2f0bb477b17b073095d499ff4496f3b30dc08f
+SHA1 (patch-libraries_liblmdb_Makefile) = 4dd8ed43169e5615b416e7e0696dd3b16e784282

Index: pkgsrc/databases/lmdb/patches/patch-libraries_liblmdb_Makefile
diff -u pkgsrc/databases/lmdb/patches/patch-libraries_liblmdb_Makefile:1.4 pkgsrc/databases/lmdb/patches/patch-libraries_liblmdb_Makefile:1.5
--- pkgsrc/databases/lmdb/patches/patch-libraries_liblmdb_Makefile:1.4  Thu Dec 20 17:55:24 2018
+++ pkgsrc/databases/lmdb/patches/patch-libraries_liblmdb_Makefile      Sun Mar 15 21:01:47 2020
@@ -1,8 +1,8 @@
-$NetBSD: patch-libraries_liblmdb_Makefile,v 1.4 2018/12/20 17:55:24 adam Exp $
+$NetBSD: patch-libraries_liblmdb_Makefile,v 1.5 2020/03/15 21:01:47 tnn Exp $
 
 Use proper install commands.
 
---- libraries/liblmdb/Makefile.orig    2018-12-19 15:57:06.000000000 +0000
+--- libraries/liblmdb/Makefile.orig    2020-01-30 17:58:35.000000000 +0000
 +++ libraries/liblmdb/Makefile
 @@ -49,10 +49,10 @@ install: $(ILIBS) $(IPROGS) $(IHDRS)
        mkdir -p $(DESTDIR)$(libdir)
@@ -28,13 +28,13 @@ Use proper install commands.
 -mdb_dump: mdb_dump.o liblmdb.a
 -mdb_load: mdb_load.o liblmdb.a
 +mdb_stat: mdb_stat.o liblmdb${SOEXT}
-+      $(CC) $(LDFLAGS) -L. -Wl,-R. -llmdb -o $@ $<
++      $(CC) $(LDFLAGS) $< -L. -llmdb -o $@
 +mdb_copy: mdb_copy.o liblmdb${SOEXT}
-+      $(CC) $(LDFLAGS) -L. -Wl,-R.  -llmdb -o $@ $<
++      $(CC) $(LDFLAGS) $< -L. -llmdb -o $@
 +mdb_dump: mdb_dump.o liblmdb${SOEXT}
-+      $(CC) $(LDFLAGS) -L. -Wl,-R. -llmdb -o $@ $<
++      $(CC) $(LDFLAGS) $< -L. -llmdb -o $@
 +mdb_load: mdb_load.o liblmdb${SOEXT}
-+      $(CC) $(LDFLAGS) -L. -Wl,-R. -llmdb -o $@ $<
++      $(CC) $(LDFLAGS) $< -L. -llmdb -o $@
  mtest:    mtest.o    liblmdb.a
  mtest2:       mtest2.o liblmdb.a
  mtest3:       mtest3.o liblmdb.a