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.
This commit is contained in:
parent
7d6afde74c
commit
f787ccca42
|
@ -19,7 +19,7 @@
|
||||||
# Copyright © 2018 Amirouche Boubekki <amirouche@hypermove.net>
|
# Copyright © 2018 Amirouche Boubekki <amirouche@hypermove.net>
|
||||||
# Copyright © 2018, 2019, 2020, 2021 Oleg Pykhalov <go.wigust@gmail.com>
|
# Copyright © 2018, 2019, 2020, 2021 Oleg Pykhalov <go.wigust@gmail.com>
|
||||||
# Copyright © 2018 Stefan Stefanović <stefanx2ovic@gmail.com>
|
# Copyright © 2018 Stefan Stefanović <stefanx2ovic@gmail.com>
|
||||||
# Copyright © 2018, 2020, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
# Copyright © 2018, 2020, 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||||
# Copyright © 2019, 2020, 2021, 2022 Guillaume Le Vaillant <glv@posteo.net>
|
# Copyright © 2019, 2020, 2021, 2022 Guillaume Le Vaillant <glv@posteo.net>
|
||||||
# Copyright © 2019, 2020 John Soo <jsoo1@asu.edu>
|
# Copyright © 2019, 2020 John Soo <jsoo1@asu.edu>
|
||||||
# Copyright © 2019 Jonathan Brielmaier <jonathan.brielmaier@web.de>
|
# Copyright © 2019 Jonathan Brielmaier <jonathan.brielmaier@web.de>
|
||||||
|
@ -1580,6 +1580,7 @@ dist_patch_DATA = \
|
||||||
%D%/packages/patches/pciutils-hurd-configure.patch \
|
%D%/packages/patches/pciutils-hurd-configure.patch \
|
||||||
%D%/packages/patches/pciutils-hurd-fix.patch \
|
%D%/packages/patches/pciutils-hurd-fix.patch \
|
||||||
%D%/packages/patches/pitivi-fix-build-with-meson-0.60.patch \
|
%D%/packages/patches/pitivi-fix-build-with-meson-0.60.patch \
|
||||||
|
%D%/packages/patches/pjproject-install-libpjsua2.patch \
|
||||||
%D%/packages/patches/plasma-framework-fix-KF5PlasmaMacros.cmake.patch \
|
%D%/packages/patches/plasma-framework-fix-KF5PlasmaMacros.cmake.patch \
|
||||||
%D%/packages/patches/ppsspp-disable-upgrade-and-gold.patch \
|
%D%/packages/patches/ppsspp-disable-upgrade-and-gold.patch \
|
||||||
%D%/packages/patches/pthreadpool-system-libraries.patch \
|
%D%/packages/patches/pthreadpool-system-libraries.patch \
|
||||||
|
|
19
gnu/packages/patches/pjproject-install-libpjsua2.patch
Normal file
19
gnu/packages/patches/pjproject-install-libpjsua2.patch
Normal file
|
@ -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 \
|
|
@ -761,7 +761,8 @@ (define-public pjproject
|
||||||
(substitute* "aconfigure.ac"
|
(substitute* "aconfigure.ac"
|
||||||
(("third_party/build/os-auto.mak") ""))
|
(("third_party/build/os-auto.mak") ""))
|
||||||
(substitute* "Makefile"
|
(substitute* "Makefile"
|
||||||
(("third_party/build") ""))))))
|
(("third_party/build") ""))))
|
||||||
|
(patches (search-patches "pjproject-install-libpjsua2.patch"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(outputs '("out" "debug" "static"))
|
(outputs '("out" "debug" "static"))
|
||||||
(arguments
|
(arguments
|
||||||
|
|
Loading…
Reference in a new issue