public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "db: fix build with libc++-3.8"

Browse Source 
This reverts commit 7e933af173.
This commit is contained in:
Daiderd Jordan
2016-11-13 00:42:23 +01:00
parent 7e933af173
commit c7d1925b6e
8 changed files with 271 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/db/db-4.8.nix
+1 -19
View File
@@ -5,23 +5,5 @@ import ./generic.nix (args // rec {
extraPatches = [ ./clang-4.8.patch ];
sha256 = "0ampbl2f0hb1nix195kz1syrqqxpmvnvnfvphambj7xjrl3iljg0";
branch = "4.8";
drvArgs.hardeningDisable = [ "format" ];
# https://community.oracle.com/thread/3952592
# this patch renames some sybols that conflict with libc++-3.8
# symbols: atomic_compare_exchange, atomic_init, store
drvArgs.prePatch = ''
substituteInPlace dbinc/db.in \
--replace '#define store' '#define store_db'
substituteInPlace dbinc/atomic.h \
--replace atomic_compare_exchange atomic_compare_exchange_db \
--replace atomic_init atomic_init_db
substituteInPlace mp/*.c \
--replace atomic_compare_exchange atomic_compare_exchange_db \
--replace atomic_init atomic_init_db
substituteInPlace mutex/*.c \
--replace atomic_compare_exchange atomic_compare_exchange_db \
--replace atomic_init atomic_init_db
'';
drvArgs = { hardeningDisable = [ "format" ]; };
})