mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-10-20 11:11:43 -04:00
cc0f98cca7
1. when db.h provides ndbm compat layer, include db.h not ndbm.h. Otherwise, compilation fails due to incompatible type declarations between libSystem and db includes. 2. tell the build system that db_185.h is present. Otherwise, the code includes db.h as if it's v1 header. (It's not.) 3. link some tests with -lresolv where needed. All three patches are posted upstream. Closes: #347616
26 lines
612 B
Diff
26 lines
612 B
Diff
From 749d9451293f9d9f8a3f506401cae369003aeebf Mon Sep 17 00:00:00 2001
|
|
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
|
|
Date: Sun, 13 Oct 2024 17:16:13 -0400
|
|
Subject: [PATCH] Include db.h for nbdb compat mode
|
|
|
|
---
|
|
lib/otp/otp_db.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/lib/otp/otp_db.c b/lib/otp/otp_db.c
|
|
index 036359c1d..32c04bc8c 100644
|
|
--- a/lib/otp/otp_db.c
|
|
+++ b/lib/otp/otp_db.c
|
|
@@ -39,7 +39,7 @@ RCSID("$Id$");
|
|
#include "otp_locl.h"
|
|
|
|
#if defined(HAVE_DB_NDBM)
|
|
-# include <ndbm.h>
|
|
+# include <db.h>
|
|
#elif !defined(HAVE_NDBM)
|
|
# include "ndbm_wrap.h"
|
|
#endif
|
|
--
|
|
2.46.0
|
|
|