diff options
| author | Brett Gilio <brettg@gnu.org> | 2020-01-05 19:31:07 -0600 |
|---|---|---|
| committer | Brett Gilio <brettg@gnu.org> | 2020-01-05 19:31:07 -0600 |
| commit | 1792a70655507625cbe654a0eec1428f210d2fd3 (patch) | |
| tree | 2e5e7fd13775965c3bf17fd17885e00f2d4b4dc1 /gnu/packages/patches/libtgvoip-disable-webrtc.patch | |
| parent | 5a0d73911c93745391a687def9ba8c7d0d41be23 (diff) | |
| download | guix-1792a70655507625cbe654a0eec1428f210d2fd3.tar.gz | |
gnu: libtgvoip: Fix failing build on i686-linux.
* gnu/local.mk (libtgvoip): Add patches for libtgvoip-disable-sse2.patch and libtgvoip-disable-webrtc.patch * gnu/packages/patches/libtgvoip-disable-sse2.patch: New file. * gnu/packages/patches/libtgvoip-disable-webrtc.patch: New file. * gnu/packages/telephony.scm (libtgvoip): Fix building on i686-linux. [source]: Reference patches for correcting failing build on i686-linux architecture. Reported-by: Diego Nicola Barbato <dnbarbato@posteo.de> Fixes <bugs.gnu.org/38944>.
Diffstat (limited to 'gnu/packages/patches/libtgvoip-disable-webrtc.patch')
| -rw-r--r-- | gnu/packages/patches/libtgvoip-disable-webrtc.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/gnu/packages/patches/libtgvoip-disable-webrtc.patch b/gnu/packages/patches/libtgvoip-disable-webrtc.patch new file mode 100644 index 0000000000..0ca532301c --- /dev/null +++ b/gnu/packages/patches/libtgvoip-disable-webrtc.patch @@ -0,0 +1,47 @@ +Copied from Debian. + +Description: Fix build of WebRTC on non-Linux systems + * Define the WEBRTC_LINUX macro only on Linux, and not on GNU/Hurd or FreeBSD. + * Fix type cast in the CurrentThreadId function. +Bug-Debian: https://bugs.debian.org/920851 +Author: Nicholas Guriev <guriev-ns@ya.ru> +Last-Update: Tue, 29 Jan 2019 23:26:44 +0300 + +--- a/libtgvoip.gyp ++++ b/libtgvoip.gyp +@@ -869,20 +869,18 @@ + '"<(OS)" == "linux"', { + 'defines': [ + 'WEBRTC_POSIX', +- 'WEBRTC_LINUX', + ], + 'conditions': [ + [ '"<!(uname -m)" == "i686"', { + 'cflags_cc': [ + '-msse2', + ], ++ }], ['"<!(uname -s)" == "Linux"', { ++ 'defines': [ ++ 'WEBRTC_LINUX', ++ ], + }] + ], +- 'direct_dependent_settings': { +- 'libraries': [ +- +- ], +- }, + }, + ], + ], +--- a/webrtc_dsp/rtc_base/platform_thread_types.cc ++++ b/webrtc_dsp/rtc_base/platform_thread_types.cc +@@ -31,7 +31,7 @@ PlatformThreadId CurrentThreadId() { + return syscall(__NR_gettid); + #else + // Default implementation for nacl and solaris. +- return reinterpret_cast<pid_t>(pthread_self()); ++ return static_cast<pid_t>(pthread_self()); + #endif + #endif // defined(WEBRTC_POSIX) + } |