Merge pull request #38289 from r-ryantm/auto-update/lmdb
lmdb: 0.9.21 -> 0.9.22
This commit is contained in:
commit
6de6aeb81d
|
@ -2,17 +2,20 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "lmdb-${version}";
|
name = "lmdb-${version}";
|
||||||
version = "0.9.21";
|
version = "0.9.22";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "LMDB";
|
owner = "LMDB";
|
||||||
repo = "lmdb";
|
repo = "lmdb";
|
||||||
rev = "LMDB_${version}";
|
rev = "LMDB_${version}";
|
||||||
sha256 = "026a6himvg3y4ssnccdbgr3c2pq3w2d47nayn05v512875z4f2w3";
|
sha256 = "0lng4ra2qrbqcf8klvqp68qarha0z4bkqhhv8lhh45agsxyrhfkj";
|
||||||
};
|
};
|
||||||
|
|
||||||
postUnpack = "sourceRoot=\${sourceRoot}/libraries/liblmdb";
|
postUnpack = "sourceRoot=\${sourceRoot}/libraries/liblmdb";
|
||||||
|
|
||||||
|
patches = [ ./hardcoded-compiler.patch ];
|
||||||
|
patchFlags = "-p3";
|
||||||
|
|
||||||
outputs = [ "bin" "out" "dev" ];
|
outputs = [ "bin" "out" "dev" ];
|
||||||
|
|
||||||
makeFlags = [ "prefix=$(out)" "CC=cc" ]
|
makeFlags = [ "prefix=$(out)" "CC=cc" ]
|
||||||
|
|
|
@ -0,0 +1,26 @@
|
||||||
|
commit 029031a68873bc3784a8561bd8e049efbd34f9d0 (HEAD)
|
||||||
|
Author: Vladimír Čunát <vcunat@gmail.com>
|
||||||
|
Date: Sun Apr 1 11:05:31 2018 +0200
|
||||||
|
|
||||||
|
make: gcc -> $(CC)
|
||||||
|
|
||||||
|
diff --git a/libraries/liblmdb/Makefile b/libraries/liblmdb/Makefile
|
||||||
|
index f254511..612484e 100644
|
||||||
|
--- a/libraries/liblmdb/Makefile
|
||||||
|
+++ b/libraries/liblmdb/Makefile
|
||||||
|
@@ -102,13 +102,13 @@ COV_OBJS=xmdb.o xmidl.o
|
||||||
|
|
||||||
|
coverage: xmtest
|
||||||
|
for i in mtest*.c [0-9]*.c; do j=`basename \$$i .c`; $(MAKE) $$j.o; \
|
||||||
|
- gcc -o x$$j $$j.o $(COV_OBJS) -pthread $(COV_FLAGS); \
|
||||||
|
+ $(CC) -o x$$j $$j.o $(COV_OBJS) -pthread $(COV_FLAGS); \
|
||||||
|
rm -rf testdb; mkdir testdb; ./x$$j; done
|
||||||
|
gcov xmdb.c
|
||||||
|
gcov xmidl.c
|
||||||
|
|
||||||
|
xmtest: mtest.o xmdb.o xmidl.o
|
||||||
|
- gcc -o xmtest mtest.o xmdb.o xmidl.o -pthread $(COV_FLAGS)
|
||||||
|
+ $(CC) -o xmtest mtest.o xmdb.o xmidl.o -pthread $(COV_FLAGS)
|
||||||
|
|
||||||
|
xmdb.o: mdb.c lmdb.h midl.h
|
||||||
|
$(CC) $(CFLAGS) -fPIC $(CPPFLAGS) -O0 $(COV_FLAGS) -c mdb.c -o $@
|
Loading…
Reference in New Issue