Attachment 124921 Details for Bug 96754 – Properly select the right system wrappers

[patch] Properly select the right system wrappers

Properly-select-the-right-system-wrappers.patch (text/plain), 2.46 KB, created by Nicolas Dufresne on 2016-07-05 21:30:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nicolas Dufresne

Created: 2016-07-05 21:30:19 UTC

Size: 2.46 KB

patch

obsolete

>From 19afb72218e45ddde1f6a0832c38000970bac5ea Mon Sep 17 00:00:00 2001
>From: Nicolas Dufresne <nicolas.dufresne@collabora.com>
>Date: Mon, 4 Jul 2016 16:02:29 -0400
>Subject: [PATCH] Properly select the right system wrappers
>
>This is needed for windows build to be usable.
>
>https://bugs.freedesktop.org/show_bug.cgi?id=96754
>---
> configure.ac                       |  6 ++++++
> webrtc/system_wrappers/Makefile.am | 12 ++++++++++--
> 2 files changed, 16 insertions(+), 2 deletions(-)
>
>diff --git a/configure.ac b/configure.ac
>index c87e0aa..557ed47 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -55,11 +55,13 @@ AS_CASE(["${host}"],
>         [
>          OS_CFLAGS="-DWEBRTC_ANDROID -DWEBRTC_LINUX"
>          PLATFORM_CFLAGS="-DWEBRTC_POSIX"
>+         HAVE_POSIX=1
>         ],
>     [*-*linux*],
>         [
>          OS_CFLAGS="-DWEBRTC_LINUX"
>          PLATFORM_CFLAGS="-DWEBRTC_POSIX"
>+         HAVE_POSIX=1
>         ],
>     [*-*darwin*],
>         [
>@@ -67,13 +69,17 @@ AS_CASE(["${host}"],
>              [OS_FLAGS="-DWEBRTC_MAC -DWEBRTC_IOS"],
>              [OS_FLAGS="-DWEBRTC_MAC"])
>          PLATFORM_CFLAGS="-DWEBRTC_POSIX"
>+         HAVE_POSIX=1
>         ]
>     [*win*],
>         [
>          PLATFORM_CFLAGS="-DWEBRTC_WIN -U__STRICT_ANSI__"
>+         HAVE_WIN=1
>         ]
> )
> AC_SUBST(PLATFORM_CFLAGS)
>+AM_CONDITIONAL(HAVE_POSIX, [test "x${HAVE_POSIX}" = "x1"])
>+AM_CONDITIONAL(HAVE_WIN, [test "x${HAVE_WIN}" = "x1"])
> 
> AS_CASE(["${host_cpu}"],
>     [i?86|x86_64],
>diff --git a/webrtc/system_wrappers/Makefile.am b/webrtc/system_wrappers/Makefile.am
>index 6c9f4ee..8215013 100644
>--- a/webrtc/system_wrappers/Makefile.am
>+++ b/webrtc/system_wrappers/Makefile.am
>@@ -42,13 +42,21 @@ libsystem_wrappers_la_SOURCES = include/aligned_malloc.h \
> 				source/trace_impl.h \
> 				source/trace_posix.h \
> 				source/trace_win.h
>-# This assumes that we want the POSIX implementation -- should eventually be
>-# converted to a conditional to include Windows support
>+if HAVE_POSIX
> libsystem_wrappers_la_SOURCES += source/critical_section_posix.cc \
> 				 source/event_timer_posix.cc \
> 				 source/rw_lock_posix.cc \
> 				 source/thread_posix.cc \
> 				 source/trace_posix.cc
>+endif
>+if HAVE_WIN
>+libsystem_wrappers_la_SOURCES += source/critical_section_win.cc \
>+				 source/event_timer_win.cc \
>+				 source/rw_lock_win.cc \
>+				 source/rw_lock_generic.cc \
>+				 source/thread_win.cc \
>+				 source/trace_win.cc
>+endif
> libsystem_wrappers_la_CXXFLAGS = $(AM_CXXFLAGS) $(COMMON_CXXFLAGS)
> 
> EXTRA_DIST = BUILD.gn \
>-- 
>2.7.4

Actions: View | Splinter Review

Attachments on bug 96754: 124808 | 124809 | 124810 | 124811 | 124812 | 124813 | 124814 | 124815 | 124817 | 124818 | 124914 | 124915 | 124916 | 124917 | 124918 | 124919 | 124920 | 124921 | 124922 | 124923

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.