Revert "db4: fix configure with llvm"

the configure program fails to compile due to using exit without a
function prototype. the fix should be to patch the configure script.

This reverts commit 227afde6d8.
This commit is contained in:
Reno Dakota
2024-07-04 03:43:02 +00:00
parent cfdae65b07
commit f8f44e1610
2 changed files with 4 additions and 7 deletions
+2 -4
View File
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, autoreconfHook, targetPlatform, ... } @ args:
{ lib, stdenv, fetchurl, autoreconfHook, ... } @ args:
import ./generic.nix (builtins.removeAttrs args ["targetPlatform"] // {
import ./generic.nix (args // {
version = "4.8.30";
sha256 = "0ampbl2f0hb1nix195kz1syrqqxpmvnvnfvphambj7xjrl3iljg0";
extraPatches = [
@@ -9,8 +9,6 @@ import ./generic.nix (builtins.removeAttrs args ["targetPlatform"] // {
./darwin-mutexes-4.8.patch
];
drvArgs.configureFlags = lib.optional (targetPlatform.useLLVM or false) "--with-mutex=POSIX/pthreads";
drvArgs.hardeningDisable = [ "format" ];
drvArgs.doCheck = false;
})
+2 -3
View File
@@ -67,8 +67,7 @@ stdenv.mkDerivation (rec {
(if compat185 then "--enable-compat185" else "--disable-compat185")
]
++ lib.optional dbmSupport "--enable-dbm"
++ lib.optional stdenv.isFreeBSD "--with-pic"
++ (drvArgs.configureFlags or []);
++ lib.optional stdenv.isFreeBSD "--with-pic";
preConfigure = ''
cd build_unix
@@ -93,4 +92,4 @@ stdenv.mkDerivation (rec {
license = license;
platforms = platforms.unix;
};
} // builtins.removeAttrs drvArgs [ "configureFlags" ])
} // drvArgs)