Module: kamailio
Branch: 5.3
Commit: 41967543be401413f5a93682ea537e2e7824ac3b
URL: https://github.com/kamailio/kamailio/commit/41967543be401413f5a93682ea537e2…
Author: Greg Troxel <gdt(a)lexort.com>
Committer: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2020-03-19T19:20:26+01:00
Makefile.defs: Only add -ldl on systems that use it
kamailio uses dlopen, and on some systems, one must link with -ldl.
On others, this is not needed and there is no libdl. For now, simply
omit -ldl on NetBSD (which doesn't have or require it), and don't try
to change behavior on other systems.
(cherry picked from commit bca9768b6f2667bad8472fa99a113b8249ca0f9a)
---
Modified: src/Makefile.defs
---
Diff: https://github.com/kamailio/kamailio/commit/41967543be401413f5a93682ea537e2…
Patch: https://github.com/kamailio/kamailio/commit/41967543be401413f5a93682ea537e2…
---
diff --git a/src/Makefile.defs b/src/Makefile.defs
index a57bc2b91e..41f33a51a0 100644
--- a/src/Makefile.defs
+++ b/src/Makefile.defs
@@ -210,9 +210,18 @@ endif
endif
+# dlopen requires -ldl on some systems, but not others. Until there
+# is clarity on which require -ldl, add just enough ifeq to fix
+# systems known not to use it.
+ifeq ($(OS), netbsd)
+LIBDL=""
+else
+LIBDL="-ldl"
+endif
+
ifeq ($(LIBSSL_SET_MUTEX_SHARED), 1)
CC_PMUTEX_OPTS = -pthread -DKSR_PTHREAD_MUTEX_SHARED
-LD_PMUTEX_OPTS = -pthread -rdynamic -ldl -Wl,-Bsymbolic-functions
+LD_PMUTEX_OPTS = -pthread -rdynamic $(LIBDL) -Wl,-Bsymbolic-functions
else
CC_PMUTEX_OPTS =
LD_PMUTEX_OPTS =
#### Pre-Submission Checklist
- [ x] Commit message has the format required by CONTRIBUTING guide
- [ x] Commits are split per component (core, individual modules, libs, utils, ...)
- [ x] Each component has a single commit (if not, squash them into one commit)
- [ x] No commits to README files for modules (changes must be done to docbook files
in `doc/` subfolder, the README file is autogenerated)
#### Type Of Change
- [ x] Small bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds new functionality)
- [ ] Breaking change (fix or feature that would change existing functionality)
#### Checklist:
- [ x] PR should be backported to stable branches (5.3 would be nice; earlier doesn't help me)
- [x] Tested changes locally (with these, the build gets vastly further)
#### Description
This PR has two changes for building on NetBSD.
One is simply adding -lm to the link line for kamailio, as math functions are used.
The other is changing the use of -ldl to a variable, leaving that at -ldl most places, and setting it to empty on NetBSD. (NetBSD does not have a /usr/lib/libdl.* and dlopen does not require any link line arguments.)
I am pretty sure that my changes won't affect the build on non-NetBSD.
Thanks,
Greg
You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/2256
-- Commit Summary --
* Makefile.defs: On NetBSD, link with -lm
* Makefile.defs: Only add -ldl on systems that use it
-- File Changes --
M src/Makefile.defs (13)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/2256.patchhttps://github.com/kamailio/kamailio/pull/2256.diff
--
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/pull/2256