Date: Sun, 29 Jul 2012 02:23:09 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r899 - in branches/experimental: mail/thunderbird-esr/files mail/thunderbird/files www/firefox-esr/files www/firefox-nightly/files www/firefox/files www/libxul/files www/seamonkey/files Message-ID: <201207290223.q6T2N91G026735@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Sun Jul 29 02:23:09 2012
New Revision: 899
Log:
- use posix_spawn on other BSDs, too
- unbreak android builds
Modified:
branches/experimental/mail/thunderbird-esr/files/patch-bug753046
branches/experimental/mail/thunderbird/files/patch-bug753046
branches/experimental/www/firefox-esr/files/patch-bug753046
branches/experimental/www/firefox-nightly/files/patch-bug753046
branches/experimental/www/firefox/files/patch-bug753046
branches/experimental/www/libxul/files/patch-bug753046
branches/experimental/www/seamonkey/files/patch-bug753046
Modified: branches/experimental/mail/thunderbird-esr/files/patch-bug753046
==============================================================================
--- branches/experimental/mail/thunderbird-esr/files/patch-bug753046 Sun Jul 29 02:22:57 2012 (r898)
+++ branches/experimental/mail/thunderbird-esr/files/patch-bug753046 Sun Jul 29 02:23:09 2012 (r899)
@@ -218,21 +218,23 @@
#include <errno.h>
#include <fcntl.h>
-@@ -17,8 +17,13 @@
+@@ -17,9 +17,16 @@
#include <unistd.h>
#if MOZ_HAVE_EXECINFO_H
#include <execinfo.h>
--#include <sys/sysctl.h>
++#endif
++
++#if defined(OS_MACOSX) || defined(OS_BSD)
+ #include <sys/sysctl.h>
#endif
+
+#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD)
+#include <sys/user.h>
-+#elif defined(OS_FREEBSD)
-+#include <sys/proc.h>
+#endif
-+#include <sys/sysctl.h>
-
++
#include "base/basictypes.h"
#include "base/eintr_wrapper.h"
+ #include "base/logging.h"
@@ -32,7 +37,7 @@ bool DebugUtil::SpawnDebuggerOnProcess(u
return false;
}
@@ -636,7 +638,7 @@
--- mozilla/ipc/chromium/src/base/process_util_bsd.cc.orig 2012-04-01 00:04:28.000000000 +0000
+++ mozilla/ipc/chromium/src/base/process_util_bsd.cc
-@@ -0,0 +1,326 @@
+@@ -0,0 +1,324 @@
+// Copyright (c) 2008 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
@@ -645,6 +647,7 @@
+
+#include "base/process_util.h"
+
++#include <sys/param.h>
+#include <ctype.h>
+#include <fcntl.h>
+#include <unistd.h>
@@ -667,7 +670,6 @@
+PRE_SYS_INCLUDE
+#include <sys/user.h>
+POST_SYS_INCLUDE
-+#define HAVE_POSIX_SPAWN 1
+#endif
+#if defined(OS_FREEBSD)
+PRE_SYS_INCLUDE
@@ -682,18 +684,16 @@
+#include "base/string_tokenizer.h"
+#include "base/string_util.h"
+
-+#if defined(OS_NETBSD)
-+#include <sys/param.h>
-+#if __NetBSD_Version__ >= 600000000
++#if __FreeBSD_version > 800039 || __DragonFly_version > 200201 \
++ || __NetBSD_Version__ >= 599006500 || OpenBSD > 201205
+#define HAVE_POSIX_SPAWN 1
+#endif
-+#endif
+
+#ifdef HAVE_POSIX_SPAWN
+PRE_SYS_INCLUDE
+#include <spawn.h>
++extern "C" char **environ;
+POST_SYS_INCLUDE
-+extern "C" char **environ __dso_public;
+#endif
+
+namespace {
@@ -1254,12 +1254,14 @@
--- mozilla/toolkit/library/Makefile.in.orig 2012-05-23 18:57:09.000000000 +0000
+++ mozilla/toolkit/library/Makefile.in
-@@ -534,6 +538,10 @@ EXTRA_DSO_LDOPTS += -lelf -ldemangle
+@@ -534,6 +538,12 @@ EXTRA_DSO_LDOPTS += -lelf -ldemangle
endif
endif
+ifneq (,$(filter DragonFly FreeBSD NetBSD OpenBSD,$(OS_ARCH)))
+OS_LIBS += $(call EXPAND_LIBNAME,kvm)
++#EXTRA_DSO_LDOPTS += -Wl,--ignore-unresolved-symbol,environ
++EXTRA_DSO_LDOPTS += -Wl,--warn-unresolved-symbols
+endif
+
ifeq ($(OS_ARCH),WINNT)
Modified: branches/experimental/mail/thunderbird/files/patch-bug753046
==============================================================================
--- branches/experimental/mail/thunderbird/files/patch-bug753046 Sun Jul 29 02:22:57 2012 (r898)
+++ branches/experimental/mail/thunderbird/files/patch-bug753046 Sun Jul 29 02:23:09 2012 (r899)
@@ -218,21 +218,23 @@
#include <errno.h>
#include <fcntl.h>
-@@ -17,8 +17,13 @@
+@@ -17,9 +17,16 @@
#include <unistd.h>
#if MOZ_HAVE_EXECINFO_H
#include <execinfo.h>
--#include <sys/sysctl.h>
++#endif
++
++#if defined(OS_MACOSX) || defined(OS_BSD)
+ #include <sys/sysctl.h>
#endif
+
+#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD)
+#include <sys/user.h>
-+#elif defined(OS_FREEBSD)
-+#include <sys/proc.h>
+#endif
-+#include <sys/sysctl.h>
-
++
#include "base/basictypes.h"
#include "base/eintr_wrapper.h"
+ #include "base/logging.h"
@@ -32,7 +37,7 @@ bool DebugUtil::SpawnDebuggerOnProcess(u
return false;
}
@@ -641,7 +643,7 @@
--- mozilla/ipc/chromium/src/base/process_util_bsd.cc.orig 2012-04-01 00:04:28.000000000 +0000
+++ mozilla/ipc/chromium/src/base/process_util_bsd.cc
-@@ -0,0 +1,326 @@
+@@ -0,0 +1,324 @@
+// Copyright (c) 2008 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
@@ -650,6 +652,7 @@
+
+#include "base/process_util.h"
+
++#include <sys/param.h>
+#include <ctype.h>
+#include <fcntl.h>
+#include <unistd.h>
@@ -672,7 +675,6 @@
+PRE_SYS_INCLUDE
+#include <sys/user.h>
+POST_SYS_INCLUDE
-+#define HAVE_POSIX_SPAWN 1
+#endif
+#if defined(OS_FREEBSD)
+PRE_SYS_INCLUDE
@@ -687,18 +689,16 @@
+#include "base/string_tokenizer.h"
+#include "base/string_util.h"
+
-+#if defined(OS_NETBSD)
-+#include <sys/param.h>
-+#if __NetBSD_Version__ >= 600000000
++#if __FreeBSD_version > 800039 || __DragonFly_version > 200201 \
++ || __NetBSD_Version__ >= 599006500 || OpenBSD > 201205
+#define HAVE_POSIX_SPAWN 1
+#endif
-+#endif
+
+#ifdef HAVE_POSIX_SPAWN
+PRE_SYS_INCLUDE
+#include <spawn.h>
++extern "C" char **environ;
+POST_SYS_INCLUDE
-+extern "C" char **environ __dso_public;
+#endif
+
+namespace {
@@ -1259,12 +1259,14 @@
--- mozilla/toolkit/library/Makefile.in.orig 2012-05-23 18:57:09.000000000 +0000
+++ mozilla/toolkit/library/Makefile.in
-@@ -534,6 +538,10 @@ EXTRA_DSO_LDOPTS += -lelf -ldemangle
+@@ -534,6 +538,12 @@ EXTRA_DSO_LDOPTS += -lelf -ldemangle
endif
endif
+ifneq (,$(filter DragonFly FreeBSD NetBSD OpenBSD,$(OS_ARCH)))
+OS_LIBS += $(call EXPAND_LIBNAME,kvm)
++#EXTRA_DSO_LDOPTS += -Wl,--ignore-unresolved-symbol,environ
++EXTRA_DSO_LDOPTS += -Wl,--warn-unresolved-symbols
+endif
+
ifeq ($(OS_ARCH),WINNT)
Modified: branches/experimental/www/firefox-esr/files/patch-bug753046
==============================================================================
--- branches/experimental/www/firefox-esr/files/patch-bug753046 Sun Jul 29 02:22:57 2012 (r898)
+++ branches/experimental/www/firefox-esr/files/patch-bug753046 Sun Jul 29 02:23:09 2012 (r899)
@@ -218,21 +218,23 @@
#include <errno.h>
#include <fcntl.h>
-@@ -17,8 +17,13 @@
+@@ -17,9 +17,16 @@
#include <unistd.h>
#if MOZ_HAVE_EXECINFO_H
#include <execinfo.h>
--#include <sys/sysctl.h>
++#endif
++
++#if defined(OS_MACOSX) || defined(OS_BSD)
+ #include <sys/sysctl.h>
#endif
+
+#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD)
+#include <sys/user.h>
-+#elif defined(OS_FREEBSD)
-+#include <sys/proc.h>
+#endif
-+#include <sys/sysctl.h>
-
++
#include "base/basictypes.h"
#include "base/eintr_wrapper.h"
+ #include "base/logging.h"
@@ -32,7 +37,7 @@ bool DebugUtil::SpawnDebuggerOnProcess(u
return false;
}
@@ -636,7 +638,7 @@
--- ipc/chromium/src/base/process_util_bsd.cc.orig 2012-04-01 00:04:28.000000000 +0000
+++ ipc/chromium/src/base/process_util_bsd.cc
-@@ -0,0 +1,326 @@
+@@ -0,0 +1,324 @@
+// Copyright (c) 2008 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
@@ -645,6 +647,7 @@
+
+#include "base/process_util.h"
+
++#include <sys/param.h>
+#include <ctype.h>
+#include <fcntl.h>
+#include <unistd.h>
@@ -667,7 +670,6 @@
+PRE_SYS_INCLUDE
+#include <sys/user.h>
+POST_SYS_INCLUDE
-+#define HAVE_POSIX_SPAWN 1
+#endif
+#if defined(OS_FREEBSD)
+PRE_SYS_INCLUDE
@@ -682,18 +684,16 @@
+#include "base/string_tokenizer.h"
+#include "base/string_util.h"
+
-+#if defined(OS_NETBSD)
-+#include <sys/param.h>
-+#if __NetBSD_Version__ >= 600000000
++#if __FreeBSD_version > 800039 || __DragonFly_version > 200201 \
++ || __NetBSD_Version__ >= 599006500 || OpenBSD > 201205
+#define HAVE_POSIX_SPAWN 1
+#endif
-+#endif
+
+#ifdef HAVE_POSIX_SPAWN
+PRE_SYS_INCLUDE
+#include <spawn.h>
++extern "C" char **environ;
+POST_SYS_INCLUDE
-+extern "C" char **environ __dso_public;
+#endif
+
+namespace {
@@ -1254,12 +1254,14 @@
--- toolkit/library/Makefile.in.orig 2012-05-23 18:57:09.000000000 +0000
+++ toolkit/library/Makefile.in
-@@ -534,6 +538,10 @@ EXTRA_DSO_LDOPTS += -lelf -ldemangle
+@@ -534,6 +538,12 @@ EXTRA_DSO_LDOPTS += -lelf -ldemangle
endif
endif
+ifneq (,$(filter DragonFly FreeBSD NetBSD OpenBSD,$(OS_ARCH)))
+OS_LIBS += $(call EXPAND_LIBNAME,kvm)
++#EXTRA_DSO_LDOPTS += -Wl,--ignore-unresolved-symbol,environ
++EXTRA_DSO_LDOPTS += -Wl,--warn-unresolved-symbols
+endif
+
ifeq ($(OS_ARCH),WINNT)
Modified: branches/experimental/www/firefox-nightly/files/patch-bug753046
==============================================================================
--- branches/experimental/www/firefox-nightly/files/patch-bug753046 Sun Jul 29 02:22:57 2012 (r898)
+++ branches/experimental/www/firefox-nightly/files/patch-bug753046 Sun Jul 29 02:23:09 2012 (r899)
@@ -218,21 +218,23 @@
#include <errno.h>
#include <fcntl.h>
-@@ -17,8 +17,13 @@
+@@ -17,9 +17,16 @@
#include <unistd.h>
#if MOZ_HAVE_EXECINFO_H
#include <execinfo.h>
--#include <sys/sysctl.h>
++#endif
++
++#if defined(OS_MACOSX) || defined(OS_BSD)
+ #include <sys/sysctl.h>
#endif
+
+#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD)
+#include <sys/user.h>
-+#elif defined(OS_FREEBSD)
-+#include <sys/proc.h>
+#endif
-+#include <sys/sysctl.h>
-
++
#include "base/basictypes.h"
#include "base/eintr_wrapper.h"
+ #include "base/logging.h"
@@ -32,7 +37,7 @@ bool DebugUtil::SpawnDebuggerOnProcess(u
return false;
}
@@ -663,7 +665,7 @@
--- ipc/chromium/src/base/process_util_bsd.cc.orig 2012-04-01 00:04:28.000000000 +0000
+++ ipc/chromium/src/base/process_util_bsd.cc
-@@ -0,0 +1,369 @@
+@@ -0,0 +1,367 @@
+// Copyright (c) 2008 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
@@ -672,6 +674,7 @@
+
+#include "base/process_util.h"
+
++#include <sys/param.h>
+#include <ctype.h>
+#include <fcntl.h>
+#include <unistd.h>
@@ -694,7 +697,6 @@
+PRE_SYS_INCLUDE
+#include <sys/user.h>
+POST_SYS_INCLUDE
-+#define HAVE_POSIX_SPAWN 1
+#endif
+#if defined(OS_FREEBSD)
+PRE_SYS_INCLUDE
@@ -717,18 +719,16 @@
+# define CHILD_UNPRIVILEGED_UID 65534
+# define CHILD_UNPRIVILEGED_GID 65534
+
-+#if defined(OS_NETBSD)
-+#include <sys/param.h>
-+#if __NetBSD_Version__ >= 600000000
++#if __FreeBSD_version > 800039 || __DragonFly_version > 200201 \
++ || __NetBSD_Version__ >= 599006500 || OpenBSD > 201205
+#define HAVE_POSIX_SPAWN 1
+#endif
-+#endif
+
+#ifdef HAVE_POSIX_SPAWN
+PRE_SYS_INCLUDE
+#include <spawn.h>
++extern "C" char **environ;
+POST_SYS_INCLUDE
-+extern "C" char **environ __dso_public;
+#endif
+
+namespace {
@@ -1273,12 +1273,14 @@
--- toolkit/library/Makefile.in.orig 2012-05-23 18:57:09.000000000 +0000
+++ toolkit/library/Makefile.in
-@@ -534,6 +538,10 @@ EXTRA_DSO_LDOPTS += -lelf -ldemangle
+@@ -534,6 +538,12 @@ EXTRA_DSO_LDOPTS += -lelf -ldemangle
endif
endif
+ifneq (,$(filter DragonFly FreeBSD NetBSD OpenBSD,$(OS_ARCH)))
+OS_LIBS += $(call EXPAND_LIBNAME,kvm)
++#EXTRA_DSO_LDOPTS += -Wl,--ignore-unresolved-symbol,environ
++EXTRA_DSO_LDOPTS += -Wl,--warn-unresolved-symbols
+endif
+
ifeq ($(OS_ARCH),WINNT)
Modified: branches/experimental/www/firefox/files/patch-bug753046
==============================================================================
--- branches/experimental/www/firefox/files/patch-bug753046 Sun Jul 29 02:22:57 2012 (r898)
+++ branches/experimental/www/firefox/files/patch-bug753046 Sun Jul 29 02:23:09 2012 (r899)
@@ -218,21 +218,23 @@
#include <errno.h>
#include <fcntl.h>
-@@ -17,8 +17,13 @@
+@@ -17,9 +17,16 @@
#include <unistd.h>
#if MOZ_HAVE_EXECINFO_H
#include <execinfo.h>
--#include <sys/sysctl.h>
++#endif
++
++#if defined(OS_MACOSX) || defined(OS_BSD)
+ #include <sys/sysctl.h>
#endif
+
+#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD)
+#include <sys/user.h>
-+#elif defined(OS_FREEBSD)
-+#include <sys/proc.h>
+#endif
-+#include <sys/sysctl.h>
-
++
#include "base/basictypes.h"
#include "base/eintr_wrapper.h"
+ #include "base/logging.h"
@@ -32,7 +37,7 @@ bool DebugUtil::SpawnDebuggerOnProcess(u
return false;
}
@@ -641,7 +643,7 @@
--- ipc/chromium/src/base/process_util_bsd.cc.orig 2012-04-01 00:04:28.000000000 +0000
+++ ipc/chromium/src/base/process_util_bsd.cc
-@@ -0,0 +1,326 @@
+@@ -0,0 +1,324 @@
+// Copyright (c) 2008 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
@@ -650,6 +652,7 @@
+
+#include "base/process_util.h"
+
++#include <sys/param.h>
+#include <ctype.h>
+#include <fcntl.h>
+#include <unistd.h>
@@ -672,7 +675,6 @@
+PRE_SYS_INCLUDE
+#include <sys/user.h>
+POST_SYS_INCLUDE
-+#define HAVE_POSIX_SPAWN 1
+#endif
+#if defined(OS_FREEBSD)
+PRE_SYS_INCLUDE
@@ -687,18 +689,16 @@
+#include "base/string_tokenizer.h"
+#include "base/string_util.h"
+
-+#if defined(OS_NETBSD)
-+#include <sys/param.h>
-+#if __NetBSD_Version__ >= 600000000
++#if __FreeBSD_version > 800039 || __DragonFly_version > 200201 \
++ || __NetBSD_Version__ >= 599006500 || OpenBSD > 201205
+#define HAVE_POSIX_SPAWN 1
+#endif
-+#endif
+
+#ifdef HAVE_POSIX_SPAWN
+PRE_SYS_INCLUDE
+#include <spawn.h>
++extern "C" char **environ;
+POST_SYS_INCLUDE
-+extern "C" char **environ __dso_public;
+#endif
+
+namespace {
@@ -1259,12 +1259,14 @@
--- toolkit/library/Makefile.in.orig 2012-05-23 18:57:09.000000000 +0000
+++ toolkit/library/Makefile.in
-@@ -534,6 +538,10 @@ EXTRA_DSO_LDOPTS += -lelf -ldemangle
+@@ -534,6 +538,12 @@ EXTRA_DSO_LDOPTS += -lelf -ldemangle
endif
endif
+ifneq (,$(filter DragonFly FreeBSD NetBSD OpenBSD,$(OS_ARCH)))
+OS_LIBS += $(call EXPAND_LIBNAME,kvm)
++#EXTRA_DSO_LDOPTS += -Wl,--ignore-unresolved-symbol,environ
++EXTRA_DSO_LDOPTS += -Wl,--warn-unresolved-symbols
+endif
+
ifeq ($(OS_ARCH),WINNT)
Modified: branches/experimental/www/libxul/files/patch-bug753046
==============================================================================
--- branches/experimental/www/libxul/files/patch-bug753046 Sun Jul 29 02:22:57 2012 (r898)
+++ branches/experimental/www/libxul/files/patch-bug753046 Sun Jul 29 02:23:09 2012 (r899)
@@ -218,21 +218,23 @@
#include <errno.h>
#include <fcntl.h>
-@@ -17,8 +17,13 @@
+@@ -17,9 +17,16 @@
#include <unistd.h>
#if MOZ_HAVE_EXECINFO_H
#include <execinfo.h>
--#include <sys/sysctl.h>
++#endif
++
++#if defined(OS_MACOSX) || defined(OS_BSD)
+ #include <sys/sysctl.h>
#endif
+
+#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD)
+#include <sys/user.h>
-+#elif defined(OS_FREEBSD)
-+#include <sys/proc.h>
+#endif
-+#include <sys/sysctl.h>
-
++
#include "base/basictypes.h"
#include "base/eintr_wrapper.h"
+ #include "base/logging.h"
@@ -32,7 +37,7 @@ bool DebugUtil::SpawnDebuggerOnProcess(u
return false;
}
@@ -636,7 +638,7 @@
--- ipc/chromium/src/base/process_util_bsd.cc.orig 2012-04-01 00:04:28.000000000 +0000
+++ ipc/chromium/src/base/process_util_bsd.cc
-@@ -0,0 +1,326 @@
+@@ -0,0 +1,324 @@
+// Copyright (c) 2008 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
@@ -645,6 +647,7 @@
+
+#include "base/process_util.h"
+
++#include <sys/param.h>
+#include <ctype.h>
+#include <fcntl.h>
+#include <unistd.h>
@@ -667,7 +670,6 @@
+PRE_SYS_INCLUDE
+#include <sys/user.h>
+POST_SYS_INCLUDE
-+#define HAVE_POSIX_SPAWN 1
+#endif
+#if defined(OS_FREEBSD)
+PRE_SYS_INCLUDE
@@ -682,18 +684,16 @@
+#include "base/string_tokenizer.h"
+#include "base/string_util.h"
+
-+#if defined(OS_NETBSD)
-+#include <sys/param.h>
-+#if __NetBSD_Version__ >= 600000000
++#if __FreeBSD_version > 800039 || __DragonFly_version > 200201 \
++ || __NetBSD_Version__ >= 599006500 || OpenBSD > 201205
+#define HAVE_POSIX_SPAWN 1
+#endif
-+#endif
+
+#ifdef HAVE_POSIX_SPAWN
+PRE_SYS_INCLUDE
+#include <spawn.h>
++extern "C" char **environ;
+POST_SYS_INCLUDE
-+extern "C" char **environ __dso_public;
+#endif
+
+namespace {
@@ -1254,12 +1254,14 @@
--- toolkit/library/Makefile.in.orig 2012-05-23 18:57:09.000000000 +0000
+++ toolkit/library/Makefile.in
-@@ -534,6 +538,10 @@ EXTRA_DSO_LDOPTS += -lelf -ldemangle
+@@ -534,6 +538,12 @@ EXTRA_DSO_LDOPTS += -lelf -ldemangle
endif
endif
+ifneq (,$(filter DragonFly FreeBSD NetBSD OpenBSD,$(OS_ARCH)))
+OS_LIBS += $(call EXPAND_LIBNAME,kvm)
++#EXTRA_DSO_LDOPTS += -Wl,--ignore-unresolved-symbol,environ
++EXTRA_DSO_LDOPTS += -Wl,--warn-unresolved-symbols
+endif
+
ifeq ($(OS_ARCH),WINNT)
Modified: branches/experimental/www/seamonkey/files/patch-bug753046
==============================================================================
--- branches/experimental/www/seamonkey/files/patch-bug753046 Sun Jul 29 02:22:57 2012 (r898)
+++ branches/experimental/www/seamonkey/files/patch-bug753046 Sun Jul 29 02:23:09 2012 (r899)
@@ -218,21 +218,23 @@
#include <errno.h>
#include <fcntl.h>
-@@ -17,8 +17,13 @@
+@@ -17,9 +17,16 @@
#include <unistd.h>
#if MOZ_HAVE_EXECINFO_H
#include <execinfo.h>
--#include <sys/sysctl.h>
++#endif
++
++#if defined(OS_MACOSX) || defined(OS_BSD)
+ #include <sys/sysctl.h>
#endif
+
+#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD)
+#include <sys/user.h>
-+#elif defined(OS_FREEBSD)
-+#include <sys/proc.h>
+#endif
-+#include <sys/sysctl.h>
-
++
#include "base/basictypes.h"
#include "base/eintr_wrapper.h"
+ #include "base/logging.h"
@@ -32,7 +37,7 @@ bool DebugUtil::SpawnDebuggerOnProcess(u
return false;
}
@@ -641,7 +643,7 @@
--- mozilla/ipc/chromium/src/base/process_util_bsd.cc.orig 2012-04-01 00:04:28.000000000 +0000
+++ mozilla/ipc/chromium/src/base/process_util_bsd.cc
-@@ -0,0 +1,326 @@
+@@ -0,0 +1,324 @@
+// Copyright (c) 2008 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
@@ -650,6 +652,7 @@
+
+#include "base/process_util.h"
+
++#include <sys/param.h>
+#include <ctype.h>
+#include <fcntl.h>
+#include <unistd.h>
@@ -672,7 +675,6 @@
+PRE_SYS_INCLUDE
+#include <sys/user.h>
+POST_SYS_INCLUDE
-+#define HAVE_POSIX_SPAWN 1
+#endif
+#if defined(OS_FREEBSD)
+PRE_SYS_INCLUDE
@@ -687,18 +689,16 @@
+#include "base/string_tokenizer.h"
+#include "base/string_util.h"
+
-+#if defined(OS_NETBSD)
-+#include <sys/param.h>
-+#if __NetBSD_Version__ >= 600000000
++#if __FreeBSD_version > 800039 || __DragonFly_version > 200201 \
++ || __NetBSD_Version__ >= 599006500 || OpenBSD > 201205
+#define HAVE_POSIX_SPAWN 1
+#endif
-+#endif
+
+#ifdef HAVE_POSIX_SPAWN
+PRE_SYS_INCLUDE
+#include <spawn.h>
++extern "C" char **environ;
+POST_SYS_INCLUDE
-+extern "C" char **environ __dso_public;
+#endif
+
+namespace {
@@ -1259,12 +1259,14 @@
--- mozilla/toolkit/library/Makefile.in.orig 2012-05-23 18:57:09.000000000 +0000
+++ mozilla/toolkit/library/Makefile.in
-@@ -534,6 +538,10 @@ EXTRA_DSO_LDOPTS += -lelf -ldemangle
+@@ -534,6 +538,12 @@ EXTRA_DSO_LDOPTS += -lelf -ldemangle
endif
endif
+ifneq (,$(filter DragonFly FreeBSD NetBSD OpenBSD,$(OS_ARCH)))
+OS_LIBS += $(call EXPAND_LIBNAME,kvm)
++#EXTRA_DSO_LDOPTS += -Wl,--ignore-unresolved-symbol,environ
++EXTRA_DSO_LDOPTS += -Wl,--warn-unresolved-symbols
+endif
+
ifeq ($(OS_ARCH),WINNT)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201207290223.q6T2N91G026735>