Bug 753046 - Add IPC support for BSDs, build glue. r=khuey,cjones

This commit is contained in:
Martin Husemann 2012-08-28 23:16:51 +02:00
parent 101baf72b4
commit 7d207348a8
5 changed files with 100 additions and 14 deletions

View File

@ -1067,3 +1067,7 @@ gst/app/gstappsrc.h
gst/video/video.h
sys/msg.h
sys/ipc.h
sys/thr.h
sys/user.h
kvm.h
spawn.h

View File

@ -240,6 +240,33 @@ endif
endif # } OS_LINUX
ifdef OS_BSD # {
CPPSRCS += \
atomicops_internals_x86_gcc.cc \
process_util_bsd.cc \
time_posix.cc \
$(NULL)
ifdef MOZ_ENABLE_GTK2
CPPSRCS += \
message_pump_glib.cc \
$(NULL)
endif
ifdef MOZ_ENABLE_QT
MOCSRCS = \
moc_message_pump_qt.cc \
$(NULL)
CPPSRCS += \
$(MOCSRCS) \
message_pump_qt.cc \
$(NULL)
endif
endif # } OS_BSD
# libevent
ifndef MOZ_NATIVE_LIBEVENT # {

View File

@ -24,17 +24,6 @@ LOCAL_INCLUDES += \
-I$(DEPTH)/ipc/ipdl/_ipdlheaders \
$(NULL)
ifeq ($(OS_ARCH),Darwin) # {
OS_MACOSX = 1
OS_POSIX = 1
DEFINES += \
-DOS_MACOSX=1 \
-DOS_POSIX=1 \
$(NULL)
else # } {
ifeq ($(OS_ARCH),WINNT) # {
OS_LIBS += $(call EXPAND_LIBNAME,psapi shell32 dbghelp)
@ -60,14 +49,66 @@ ifdef _MSC_VER
DEFINES += -DCOMPILER_MSVC
endif
else # } {
OS_POSIX = 1
DEFINES += -DOS_POSIX=1
ifeq ($(OS_ARCH),Darwin) # {
OS_MACOSX = 1
DEFINES += \
-DOS_MACOSX=1 \
$(NULL)
else # } {
ifeq ($(OS_ARCH),DragonFly) # {
OS_DRAGONFLY = 1
OS_BSD = 1
OS_LIBS += $(call EXPAND_LIBNAME,kvm)
DEFINES += \
-DOS_DRAGONFLY=1 \
-DOS_BSD=1 \
$(NULL)
else # } {
ifeq ($(OS_ARCH),FreeBSD) # {
OS_FREEBSD = 1
OS_BSD = 1
OS_LIBS += $(call EXPAND_LIBNAME,kvm)
DEFINES += \
-DOS_FREEBSD=1 \
-DOS_BSD=1 \
$(NULL)
else # } {
ifeq ($(OS_ARCH),NetBSD) # {
OS_NETBSD = 1
OS_BSD = 1
OS_LIBS += $(call EXPAND_LIBNAME,kvm)
DEFINES += \
-DOS_NETBSD=1 \
-DOS_BSD=1 \
$(NULL)
else # } {
ifeq ($(OS_ARCH),OpenBSD) # {
OS_OPENBSD = 1
OS_BSD = 1
OS_LIBS += $(call EXPAND_LIBNAME,kvm)
DEFINES += \
-DOS_OPENBSD=1 \
-DOS_BSD=1 \
$(NULL)
else # } {
OS_LINUX = 1
OS_POSIX = 1
DEFINES += \
-DOS_LINUX=1 \
-DOS_POSIX=1 \
$(NULL)
# NB: to stop gcc warnings about exporting template instantiation
@ -75,4 +116,8 @@ OS_CXXFLAGS := $(filter-out -pedantic,$(OS_CXXFLAGS))
endif # }
endif # }
endif # }
endif # }
endif # }
endif # }

View File

@ -1067,3 +1067,7 @@ gst/app/gstappsrc.h
gst/video/video.h
sys/msg.h
sys/ipc.h
sys/thr.h
sys/user.h
kvm.h
spawn.h

View File

@ -533,6 +533,12 @@ EXTRA_DSO_LDOPTS += -lelf -ldemangle
endif
endif
ifneq (,$(filter DragonFly FreeBSD NetBSD OpenBSD,$(OS_ARCH)))
OS_LIBS += $(call EXPAND_LIBNAME,kvm)
# keep `environ' unresolved, see bug 14426 for binutils
EXTRA_DSO_LDOPTS += -Wl,--warn-unresolved-symbols
endif
ifeq ($(OS_ARCH),WINNT)
OS_LIBS += $(call EXPAND_LIBNAME,shell32 ole32 version winspool comdlg32 imm32 msimg32 shlwapi psapi ws2_32 dbghelp rasapi32 rasdlg iphlpapi uxtheme setupapi secur32 sensorsapi portabledeviceguids windowscodecs wininet)
ifdef ACCESSIBILITY