diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-04-01 11:09:13 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-04-01 11:09:48 +0200 |
| commit | a48f50641c02de6e3555f853163f756c28a6ca83 (patch) | |
| tree | df63b498354444e5aee16c5e6b529a6503584772 | |
| parent | b5b314c13728b09b353104a68ee856f12e6304dc (diff) | |
| download | nixlib-a48f50641c02de6e3555f853163f756c28a6ca83.tar nixlib-a48f50641c02de6e3555f853163f756c28a6ca83.tar.gz nixlib-a48f50641c02de6e3555f853163f756c28a6ca83.tar.bz2 nixlib-a48f50641c02de6e3555f853163f756c28a6ca83.tar.lz nixlib-a48f50641c02de6e3555f853163f756c28a6ca83.tar.xz nixlib-a48f50641c02de6e3555f853163f756c28a6ca83.tar.zst nixlib-a48f50641c02de6e3555f853163f756c28a6ca83.zip | |
lmdb: patch-out hardcoded compiler
| -rw-r--r-- | pkgs/development/libraries/lmdb/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/libraries/lmdb/hardcoded-compiler.patch | 26 |
2 files changed, 29 insertions, 0 deletions
diff --git a/pkgs/development/libraries/lmdb/default.nix b/pkgs/development/libraries/lmdb/default.nix index f1dabfc6c20e..0bb3a67d9502 100644 --- a/pkgs/development/libraries/lmdb/default.nix +++ b/pkgs/development/libraries/lmdb/default.nix @@ -13,6 +13,9 @@ stdenv.mkDerivation rec { postUnpack = "sourceRoot=\${sourceRoot}/libraries/liblmdb"; + patches = [ ./hardcoded-compiler.patch ]; + patchFlags = "-p3"; + outputs = [ "bin" "out" "dev" ]; makeFlags = [ "prefix=$(out)" "CC=cc" ] diff --git a/pkgs/development/libraries/lmdb/hardcoded-compiler.patch b/pkgs/development/libraries/lmdb/hardcoded-compiler.patch new file mode 100644 index 000000000000..ddb247b7f113 --- /dev/null +++ b/pkgs/development/libraries/lmdb/hardcoded-compiler.patch @@ -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 $@ |