Bug 826931 (follow-up): fix build break. r=me
authorVicamo Yang <vyang@mozilla.com>
Mon, 04 Feb 2013 18:56:12 +0800
changeset 120728 fb0db0c171d377960f7213439a6d827fefcbc1f6
parent 120727 785366ece8a0e749a8c26126e7aa1111c46431f7
child 120729 36b5ab89ae64ee4343e275b5c55e05be6ed8d9da
push id22386
push uservyang@mozilla.com
push dateMon, 04 Feb 2013 10:56:22 +0000
treeherdermozilla-inbound@fb0db0c171d3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs826931
milestone21.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 826931 (follow-up): fix build break. r=me 1. include netdb.h for |gethostbyname|. 2. link mozipcunixsocket_s whenever MOZ_B2G_RIL is enabled.
ipc/ril/Ril.cpp
toolkit/library/Makefile.in
--- a/ipc/ril/Ril.cpp
+++ b/ipc/ril/Ril.cpp
@@ -2,16 +2,17 @@
 /* vim: set sw=4 ts=8 et ft=cpp: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include <fcntl.h>
 #include <sys/socket.h>
 #include <sys/un.h>
+#include <netdb.h> // For gethostbyname.
 
 #undef LOG
 #if defined(MOZ_WIDGET_GONK)
 #include <android/log.h>
 #define LOG(args...)  __android_log_print(ANDROID_LOG_INFO, "Gonk", args)
 #else
 #define LOG(args...)  printf(args);
 #endif
--- a/toolkit/library/Makefile.in
+++ b/toolkit/library/Makefile.in
@@ -108,17 +108,21 @@ STATIC_LIBS += \
   dombindings_s \
   $(NULL)
 
 ifdef MOZ_B2G_RIL #{
 STATIC_LIBS += mozril_s
 endif #}
 
 ifdef MOZ_B2G_BT #{
-STATIC_LIBS += mozdbus_s mozipcunixsocket_s
+STATIC_LIBS += mozdbus_s
+endif #}
+
+ifneq ($(strip $(MOZ_B2G_RIL)$(MOZ_B2G_BT)),) #{
+STATIC_LIBS += mozipcunixsocket_s
 endif #}
 
 ifeq (gonk,$(MOZ_WIDGET_TOOLKIT))
 STATIC_LIBS += moznetd_s
 endif
 
 ifdef MOZ_B2G_CAMERA #{
 OS_LIBS += -lstagefright -lstagefright_omx