diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-12 15:25:22 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-13 00:57:52 -0500 |
| commit | f787ccca42f1b8acb347892246fc36bc44392712 (patch) | |
| tree | 0e24235a0fed73235558b87122061df5a5e264b7 /gnu/packages | |
| parent | 7d6afde74c8668751a8163d8356e52eb207a2193 (diff) | |
| download | guix-patches-f787ccca42f1b8acb347892246fc36bc44392712.tar guix-patches-f787ccca42f1b8acb347892246fc36bc44392712.tar.gz | |
gnu: pjproject: Apply patch to install the libpjsua2 shared library.
* gnu/packages/patches/pjproject-install-libpjsua2.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/telephony.scm (pjproject): Apply it.
Diffstat (limited to 'gnu/packages')
| -rw-r--r-- | gnu/packages/patches/pjproject-install-libpjsua2.patch | 19 | ||||
| -rw-r--r-- | gnu/packages/telephony.scm | 3 |
2 files changed, 21 insertions, 1 deletions
diff --git a/gnu/packages/patches/pjproject-install-libpjsua2.patch b/gnu/packages/patches/pjproject-install-libpjsua2.patch new file mode 100644 index 0000000000..ef9b0de91f --- /dev/null +++ b/gnu/packages/patches/pjproject-install-libpjsua2.patch @@ -0,0 +1,19 @@ +# Retrieved from upstream: +# https://github.com/pjsip/pjproject/commit/742f7dc252ded778a8b677937791c02e2fbc0dde +diff --git a/Makefile b/Makefile +index 31a6d39d4..74e246a44 100644 +--- a/Makefile ++++ b/Makefile +@@ -121,9 +121,10 @@ cmp_wav: + + install: + mkdir -p $(DESTDIR)$(libdir)/ +- cp -af $(APP_LIB_FILES) $(DESTDIR)$(libdir)/ + if [ "$(PJ_EXCLUDE_PJSUA2)x" = "x" ] ; then \ +- cp -af $(PJ_DIR)/pjsip/lib/libpjsua2-$(LIB_SUFFIX) $(DESTDIR)$(libdir)/; \ ++ cp -af $(APP_LIBXX_FILES) $(DESTDIR)$(libdir)/; \ ++ else \ ++ cp -af $(APP_LIB_FILES) $(DESTDIR)$(libdir)/; \ + fi + mkdir -p $(DESTDIR)$(includedir)/ + for d in pjlib pjlib-util pjnath pjmedia pjsip; do \ diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index eb038c411e..9d384ab166 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -761,7 +761,8 @@ your calls and messages.") (substitute* "aconfigure.ac" (("third_party/build/os-auto.mak") "")) (substitute* "Makefile" - (("third_party/build") "")))))) + (("third_party/build") "")))) + (patches (search-patches "pjproject-install-libpjsua2.patch")))) (build-system gnu-build-system) (outputs '("out" "debug" "static")) (arguments |