Date: Fri, 15 Jun 2012 05:42:07 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r759 - in branches/experimental: Mk mail/thunderbird-beta/files mail/thunderbird-esr/files mail/thunderbird/files www/firefox-beta/files www/firefox-esr/files www/firefox-nightly/files www/firefox/files www/libxul/files www/seamonkey-beta/files www/seamonkey/files Message-ID: <201206150542.q5F5g78L033740@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Fri Jun 15 05:42:07 2012
New Revision: 759
Log:
switch to libevent2, libevent1 is no longer actively developed
The patches are used to honor non-default --libdir/--includedir
of devel/libevent2. If you do not want two versions of libevent
use the following in bsd.gecko.mk:
.if exists(${LOCALBASE}/lib/event2)
event_LIB_DEPENDS= event-2.0:${PORTSDIR}/devel/libevent2
.else
event_LIB_DEPENDS= event-1:${PORTSDIR}/devel/libevent
.endif
PR: ports/161421
Added:
branches/experimental/mail/thunderbird-beta/files/patch-mozilla-ipc-chromium-Makefile.in
branches/experimental/mail/thunderbird-beta/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc
branches/experimental/mail/thunderbird-esr/files/patch-mozilla-ipc-chromium-Makefile.in
branches/experimental/mail/thunderbird-esr/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc
branches/experimental/mail/thunderbird/files/patch-mozilla-ipc-chromium-Makefile.in
branches/experimental/mail/thunderbird/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc
branches/experimental/www/firefox-beta/files/patch-ipc-chromium-Makefile.in
branches/experimental/www/firefox-esr/files/patch-ipc-chromium-Makefile.in
branches/experimental/www/firefox-nightly/files/patch-ipc-chromium-Makefile.in
branches/experimental/www/firefox-nightly/files/patch-ipc-chromium-src-base-message_pump_libevent.cc
branches/experimental/www/firefox/files/patch-ipc-chromium-Makefile.in
branches/experimental/www/firefox/files/patch-ipc-chromium-src-base-message_pump_libevent.cc
branches/experimental/www/libxul/files/patch-ipc-chromium-Makefile.in
branches/experimental/www/seamonkey-beta/files/patch-mozilla-ipc-chromium-Makefile.in
branches/experimental/www/seamonkey-beta/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc
branches/experimental/www/seamonkey/files/patch-mozilla-ipc-chromium-Makefile.in
branches/experimental/www/seamonkey/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc
Modified:
branches/experimental/Mk/bsd.gecko.mk
branches/experimental/mail/thunderbird-beta/files/patch-mozilla-configure.in
branches/experimental/mail/thunderbird-esr/files/patch-mozilla-configure.in
branches/experimental/mail/thunderbird/files/patch-mozilla-configure.in
branches/experimental/www/firefox-beta/files/patch-configure.in
branches/experimental/www/firefox-beta/files/patch-ipc-chromium-src-base-message_pump_libevent.cc
branches/experimental/www/firefox-esr/files/patch-configure.in
branches/experimental/www/firefox-esr/files/patch-ipc-chromium-src-base-message_pump_libevent.cc
branches/experimental/www/firefox-nightly/files/patch-configure.in
branches/experimental/www/firefox/files/patch-configure.in
branches/experimental/www/libxul/files/patch-configure.in
branches/experimental/www/libxul/files/patch-ipc-chromium-src-base-message_pump_libevent.cc
branches/experimental/www/seamonkey-beta/files/patch-mozilla-configure.in
branches/experimental/www/seamonkey/files/patch-mozilla-configure.in
Modified: branches/experimental/Mk/bsd.gecko.mk
==============================================================================
--- branches/experimental/Mk/bsd.gecko.mk Fri Jun 15 00:58:30 2012 (r758)
+++ branches/experimental/Mk/bsd.gecko.mk Fri Jun 15 05:42:07 2012 (r759)
@@ -579,7 +579,7 @@
dbm_EXTRACT_AFTER_ARGS= --exclude mozilla*/dbm
-event_LIB_DEPENDS= event-1:${PORTSDIR}/devel/libevent
+event_LIB_DEPENDS= event-2.0:${PORTSDIR}/devel/libevent2
event_MOZ_OPTIONS= --with-system-libevent=${LOCALBASE}
event_EXTRACT_AFTER_ARGS= --exclude mozilla*/ipc/chromium/src/third_party/libevent
Modified: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-configure.in
==============================================================================
--- branches/experimental/mail/thunderbird-beta/files/patch-mozilla-configure.in Fri Jun 15 00:58:30 2012 (r758)
+++ branches/experimental/mail/thunderbird-beta/files/patch-mozilla-configure.in Fri Jun 15 05:42:07 2012 (r759)
@@ -45,6 +45,29 @@
AC_DEFINE(HAVE_CLOCK_MONOTONIC)
AC_SUBST(HAVE_CLOCK_MONOTONIC)
AC_SUBST(REALTIME_LIBS)
+@@ -4230,6 +4233,9 @@
+ if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then
+ MOZ_NATIVE_LIBEVENT=
+ else
++PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent,
++ [MOZ_NATIVE_LIBEVENT=1
++ MOZ_LIBEVENT_INCLUDES="$MOZ_LIBEVENT_CFLAGS"], [
+ if test "${LIBEVENT_DIR}" = "yes"; then
+ LIBEVENT_DIR=/usr
+ fi
+@@ -4242,10 +4248,11 @@ else
+ AC_MSG_ERROR([--with-system-libevent requested but event.h not found]))
+ AC_CHECK_LIB(event, event_init,
+ [MOZ_NATIVE_LIBEVENT=1
+- MOZ_LIBEVENT_INCLUDES="${LIBEVENT_DIR}/include"
++ MOZ_LIBEVENT_INCLUDES="-I${LIBEVENT_DIR}/include"
+ MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"],
+ [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=])
+ fi
++])
+ CFLAGS=$_SAVE_CFLAGS
+ LDFLAGS=$_SAVE_LDFLAGS
+ LIBS=$_SAVE_LIBS
@@ -4808,7 +4810,7 @@ CFLAGS=$_SAVE_CFLAGS
LDFLAGS=$_SAVE_LDFLAGS
LIBS=$_SAVE_LIBS
Added: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-ipc-chromium-Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/mail/thunderbird-beta/files/patch-mozilla-ipc-chromium-Makefile.in Fri Jun 15 05:42:07 2012 (r759)
@@ -0,0 +1,13 @@
+--- mozilla/ipc/chromium/Makefile.in~
++++ mozilla/ipc/chromium/Makefile.in
+@@ -23,9 +23,7 @@ vpath %.c \
+ $(srcdir)/src/third_party/libevent \
+ $(NULL)
+ else # } else {
+-# message_pump_libevent.cc includes third_party/libevent/event.h,
+-# which we put in $(DIST), see export rule below
+-LOCAL_INCLUDES += -I$(DIST)
++LOCAL_INCLUDES += $(MOZ_LIBEVENT_INCLUDES)
+ endif # }
+
+ vpath %.cc \
Added: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/mail/thunderbird-beta/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc Fri Jun 15 05:42:07 2012 (r759)
@@ -0,0 +1,11 @@
+--- mozilla/ipc/chromium/src/base/message_pump_libevent.cc~
++++ mozilla/ipc/chromium/src/base/message_pump_libevent.cc
+@@ -15,7 +15,7 @@
+ #include "base/scoped_nsautorelease_pool.h"
+ #include "base/scoped_ptr.h"
+ #include "base/time.h"
+-#include "third_party/libevent/event.h"
++#include "event.h"
+
+ // Lifecycle of struct event
+ // Libevent uses two main data structures:
Modified: branches/experimental/mail/thunderbird-esr/files/patch-mozilla-configure.in
==============================================================================
--- branches/experimental/mail/thunderbird-esr/files/patch-mozilla-configure.in Fri Jun 15 00:58:30 2012 (r758)
+++ branches/experimental/mail/thunderbird-esr/files/patch-mozilla-configure.in Fri Jun 15 05:42:07 2012 (r759)
@@ -45,6 +45,29 @@
AC_DEFINE(HAVE_CLOCK_MONOTONIC)
AC_SUBST(HAVE_CLOCK_MONOTONIC)
AC_SUBST(REALTIME_LIBS)
+@@ -4230,6 +4233,9 @@
+ if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then
+ MOZ_NATIVE_LIBEVENT=
+ else
++PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent,
++ [MOZ_NATIVE_LIBEVENT=1
++ MOZ_LIBEVENT_INCLUDES="$MOZ_LIBEVENT_CFLAGS"], [
+ if test "${LIBEVENT_DIR}" = "yes"; then
+ LIBEVENT_DIR=/usr
+ fi
+@@ -4242,10 +4248,11 @@ else
+ AC_MSG_ERROR([--with-system-libevent requested but event.h not found]))
+ AC_CHECK_LIB(event, event_init,
+ [MOZ_NATIVE_LIBEVENT=1
+- MOZ_LIBEVENT_INCLUDES="${LIBEVENT_DIR}/include"
++ MOZ_LIBEVENT_INCLUDES="-I${LIBEVENT_DIR}/include"
+ MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"],
+ [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=])
+ fi
++])
+ CFLAGS=$_SAVE_CFLAGS
+ LDFLAGS=$_SAVE_LDFLAGS
+ LIBS=$_SAVE_LIBS
@@ -4808,7 +4810,7 @@ CFLAGS=$_SAVE_CFLAGS
LDFLAGS=$_SAVE_LDFLAGS
LIBS=$_SAVE_LIBS
Added: branches/experimental/mail/thunderbird-esr/files/patch-mozilla-ipc-chromium-Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/mail/thunderbird-esr/files/patch-mozilla-ipc-chromium-Makefile.in Fri Jun 15 05:42:07 2012 (r759)
@@ -0,0 +1,13 @@
+--- mozilla/ipc/chromium/Makefile.in~
++++ mozilla/ipc/chromium/Makefile.in
+@@ -23,9 +23,7 @@ vpath %.c \
+ $(srcdir)/src/third_party/libevent \
+ $(NULL)
+ else # } else {
+-# message_pump_libevent.cc includes third_party/libevent/event.h,
+-# which we put in $(DIST), see export rule below
+-LOCAL_INCLUDES += -I$(DIST)
++LOCAL_INCLUDES += $(MOZ_LIBEVENT_INCLUDES)
+ endif # }
+
+ vpath %.cc \
Added: branches/experimental/mail/thunderbird-esr/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/mail/thunderbird-esr/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc Fri Jun 15 05:42:07 2012 (r759)
@@ -0,0 +1,11 @@
+--- mozilla/ipc/chromium/src/base/message_pump_libevent.cc~
++++ mozilla/ipc/chromium/src/base/message_pump_libevent.cc
+@@ -15,7 +15,7 @@
+ #include "base/scoped_nsautorelease_pool.h"
+ #include "base/scoped_ptr.h"
+ #include "base/time.h"
+-#include "third_party/libevent/event.h"
++#include "event.h"
+
+ // Lifecycle of struct event
+ // Libevent uses two main data structures:
Modified: branches/experimental/mail/thunderbird/files/patch-mozilla-configure.in
==============================================================================
--- branches/experimental/mail/thunderbird/files/patch-mozilla-configure.in Fri Jun 15 00:58:30 2012 (r758)
+++ branches/experimental/mail/thunderbird/files/patch-mozilla-configure.in Fri Jun 15 05:42:07 2012 (r759)
@@ -18,6 +18,29 @@
INTEL_ARCHITECTURE=1
esac
+@@ -4230,6 +4233,9 @@
+ if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then
+ MOZ_NATIVE_LIBEVENT=
+ else
++PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent,
++ [MOZ_NATIVE_LIBEVENT=1
++ MOZ_LIBEVENT_INCLUDES="$MOZ_LIBEVENT_CFLAGS"], [
+ if test "${LIBEVENT_DIR}" = "yes"; then
+ LIBEVENT_DIR=/usr
+ fi
+@@ -4242,10 +4248,11 @@ else
+ AC_MSG_ERROR([--with-system-libevent requested but event.h not found]))
+ AC_CHECK_LIB(event, event_init,
+ [MOZ_NATIVE_LIBEVENT=1
+- MOZ_LIBEVENT_INCLUDES="${LIBEVENT_DIR}/include"
++ MOZ_LIBEVENT_INCLUDES="-I${LIBEVENT_DIR}/include"
+ MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"],
+ [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=])
+ fi
++])
+ CFLAGS=$_SAVE_CFLAGS
+ LDFLAGS=$_SAVE_LDFLAGS
+ LIBS=$_SAVE_LIBS
@@ -4580,7 +4580,7 @@
LDFLAGS=$_SAVE_LDFLAGS
LIBS=$_SAVE_LIBS
Added: branches/experimental/mail/thunderbird/files/patch-mozilla-ipc-chromium-Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/mail/thunderbird/files/patch-mozilla-ipc-chromium-Makefile.in Fri Jun 15 05:42:07 2012 (r759)
@@ -0,0 +1,13 @@
+--- mozilla/ipc/chromium/Makefile.in~
++++ mozilla/ipc/chromium/Makefile.in
+@@ -23,9 +23,7 @@ vpath %.c \
+ $(srcdir)/src/third_party/libevent \
+ $(NULL)
+ else # } else {
+-# message_pump_libevent.cc includes third_party/libevent/event.h,
+-# which we put in $(DIST), see export rule below
+-LOCAL_INCLUDES += -I$(DIST)
++LOCAL_INCLUDES += $(MOZ_LIBEVENT_INCLUDES)
+ endif # }
+
+ vpath %.cc \
Added: branches/experimental/mail/thunderbird/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/mail/thunderbird/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc Fri Jun 15 05:42:07 2012 (r759)
@@ -0,0 +1,11 @@
+--- mozilla/ipc/chromium/src/base/message_pump_libevent.cc~
++++ mozilla/ipc/chromium/src/base/message_pump_libevent.cc
+@@ -15,7 +15,7 @@
+ #include "base/scoped_nsautorelease_pool.h"
+ #include "base/scoped_ptr.h"
+ #include "base/time.h"
+-#include "third_party/libevent/event.h"
++#include "event.h"
+
+ // Lifecycle of struct event
+ // Libevent uses two main data structures:
Modified: branches/experimental/www/firefox-beta/files/patch-configure.in
==============================================================================
--- branches/experimental/www/firefox-beta/files/patch-configure.in Fri Jun 15 00:58:30 2012 (r758)
+++ branches/experimental/www/firefox-beta/files/patch-configure.in Fri Jun 15 05:42:07 2012 (r759)
@@ -55,6 +55,29 @@
dnl system libevent Support
dnl ========================================================
+@@ -4230,6 +4233,9 @@
+ if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then
+ MOZ_NATIVE_LIBEVENT=
+ else
++PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent,
++ [MOZ_NATIVE_LIBEVENT=1
++ MOZ_LIBEVENT_INCLUDES="$MOZ_LIBEVENT_CFLAGS"], [
+ if test "${LIBEVENT_DIR}" = "yes"; then
+ LIBEVENT_DIR=/usr
+ fi
+@@ -4242,10 +4248,11 @@ else
+ AC_MSG_ERROR([--with-system-libevent requested but event.h not found]))
+ AC_CHECK_LIB(event, event_init,
+ [MOZ_NATIVE_LIBEVENT=1
+- MOZ_LIBEVENT_INCLUDES="${LIBEVENT_DIR}/include"
++ MOZ_LIBEVENT_INCLUDES="-I${LIBEVENT_DIR}/include"
+ MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"],
+ [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=])
+ fi
++])
+ CFLAGS=$_SAVE_CFLAGS
+ LDFLAGS=$_SAVE_LDFLAGS
+ LIBS=$_SAVE_LIBS
@@ -4808,7 +4810,7 @@ CFLAGS=$_SAVE_CFLAGS
LDFLAGS=$_SAVE_LDFLAGS
LIBS=$_SAVE_LIBS
Added: branches/experimental/www/firefox-beta/files/patch-ipc-chromium-Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-beta/files/patch-ipc-chromium-Makefile.in Fri Jun 15 05:42:07 2012 (r759)
@@ -0,0 +1,13 @@
+--- ipc/chromium/Makefile.in~
++++ ipc/chromium/Makefile.in
+@@ -23,9 +23,7 @@ vpath %.c \
+ $(srcdir)/src/third_party/libevent \
+ $(NULL)
+ else # } else {
+-# message_pump_libevent.cc includes third_party/libevent/event.h,
+-# which we put in $(DIST), see export rule below
+-LOCAL_INCLUDES += -I$(DIST)
++LOCAL_INCLUDES += $(MOZ_LIBEVENT_INCLUDES)
+ endif # }
+
+ vpath %.cc \
Modified: branches/experimental/www/firefox-beta/files/patch-ipc-chromium-src-base-message_pump_libevent.cc
==============================================================================
--- branches/experimental/www/firefox-beta/files/patch-ipc-chromium-src-base-message_pump_libevent.cc Fri Jun 15 00:58:30 2012 (r758)
+++ branches/experimental/www/firefox-beta/files/patch-ipc-chromium-src-base-message_pump_libevent.cc Fri Jun 15 05:42:07 2012 (r759)
@@ -8,3 +8,12 @@
#include "eintr_wrapper.h"
#include "base/logging.h"
+@@ -15,7 +15,7 @@
+ #include "base/scoped_nsautorelease_pool.h"
+ #include "base/scoped_ptr.h"
+ #include "base/time.h"
+-#include "third_party/libevent/event.h"
++#include "event.h"
+
+ // Lifecycle of struct event
+ // Libevent uses two main data structures:
Modified: branches/experimental/www/firefox-esr/files/patch-configure.in
==============================================================================
--- branches/experimental/www/firefox-esr/files/patch-configure.in Fri Jun 15 00:58:30 2012 (r758)
+++ branches/experimental/www/firefox-esr/files/patch-configure.in Fri Jun 15 05:42:07 2012 (r759)
@@ -55,6 +55,29 @@
dnl system libevent Support
dnl ========================================================
+@@ -4230,6 +4233,9 @@
+ if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then
+ MOZ_NATIVE_LIBEVENT=
+ else
++PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent,
++ [MOZ_NATIVE_LIBEVENT=1
++ MOZ_LIBEVENT_INCLUDES="$MOZ_LIBEVENT_CFLAGS"], [
+ if test "${LIBEVENT_DIR}" = "yes"; then
+ LIBEVENT_DIR=/usr
+ fi
+@@ -4242,10 +4248,11 @@ else
+ AC_MSG_ERROR([--with-system-libevent requested but event.h not found]))
+ AC_CHECK_LIB(event, event_init,
+ [MOZ_NATIVE_LIBEVENT=1
+- MOZ_LIBEVENT_INCLUDES="${LIBEVENT_DIR}/include"
++ MOZ_LIBEVENT_INCLUDES="-I${LIBEVENT_DIR}/include"
+ MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"],
+ [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=])
+ fi
++])
+ CFLAGS=$_SAVE_CFLAGS
+ LDFLAGS=$_SAVE_LDFLAGS
+ LIBS=$_SAVE_LIBS
@@ -4808,7 +4810,7 @@ CFLAGS=$_SAVE_CFLAGS
LDFLAGS=$_SAVE_LDFLAGS
LIBS=$_SAVE_LIBS
Added: branches/experimental/www/firefox-esr/files/patch-ipc-chromium-Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-esr/files/patch-ipc-chromium-Makefile.in Fri Jun 15 05:42:07 2012 (r759)
@@ -0,0 +1,13 @@
+--- ipc/chromium/Makefile.in~
++++ ipc/chromium/Makefile.in
+@@ -23,9 +23,7 @@ vpath %.c \
+ $(srcdir)/src/third_party/libevent \
+ $(NULL)
+ else # } else {
+-# message_pump_libevent.cc includes third_party/libevent/event.h,
+-# which we put in $(DIST), see export rule below
+-LOCAL_INCLUDES += -I$(DIST)
++LOCAL_INCLUDES += $(MOZ_LIBEVENT_INCLUDES)
+ endif # }
+
+ vpath %.cc \
Modified: branches/experimental/www/firefox-esr/files/patch-ipc-chromium-src-base-message_pump_libevent.cc
==============================================================================
--- branches/experimental/www/firefox-esr/files/patch-ipc-chromium-src-base-message_pump_libevent.cc Fri Jun 15 00:58:30 2012 (r758)
+++ branches/experimental/www/firefox-esr/files/patch-ipc-chromium-src-base-message_pump_libevent.cc Fri Jun 15 05:42:07 2012 (r759)
@@ -8,3 +8,12 @@
#include "eintr_wrapper.h"
#include "base/logging.h"
+@@ -15,7 +15,7 @@
+ #include "base/scoped_nsautorelease_pool.h"
+ #include "base/scoped_ptr.h"
+ #include "base/time.h"
+-#include "third_party/libevent/event.h"
++#include "event.h"
+
+ // Lifecycle of struct event
+ // Libevent uses two main data structures:
Modified: branches/experimental/www/firefox-nightly/files/patch-configure.in
==============================================================================
--- branches/experimental/www/firefox-nightly/files/patch-configure.in Fri Jun 15 00:58:30 2012 (r758)
+++ branches/experimental/www/firefox-nightly/files/patch-configure.in Fri Jun 15 05:42:07 2012 (r759)
@@ -28,6 +28,29 @@
dnl system libevent Support
dnl ========================================================
+@@ -4230,6 +4233,9 @@
+ if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then
+ MOZ_NATIVE_LIBEVENT=
+ else
++PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent,
++ [MOZ_NATIVE_LIBEVENT=1
++ MOZ_LIBEVENT_INCLUDES="$MOZ_LIBEVENT_CFLAGS"], [
+ if test "${LIBEVENT_DIR}" = "yes"; then
+ LIBEVENT_DIR=/usr
+ fi
+@@ -4242,10 +4248,11 @@ else
+ AC_MSG_ERROR([--with-system-libevent requested but event.h not found]))
+ AC_CHECK_LIB(event, event_init,
+ [MOZ_NATIVE_LIBEVENT=1
+- MOZ_LIBEVENT_INCLUDES="${LIBEVENT_DIR}/include"
++ MOZ_LIBEVENT_INCLUDES="-I${LIBEVENT_DIR}/include"
+ MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"],
+ [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=])
+ fi
++])
+ CFLAGS=$_SAVE_CFLAGS
+ LDFLAGS=$_SAVE_LDFLAGS
+ LIBS=$_SAVE_LIBS
@@ -4263,6 +4270,10 @@ else
fi
fi
Added: branches/experimental/www/firefox-nightly/files/patch-ipc-chromium-Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-nightly/files/patch-ipc-chromium-Makefile.in Fri Jun 15 05:42:07 2012 (r759)
@@ -0,0 +1,13 @@
+--- ipc/chromium/Makefile.in~
++++ ipc/chromium/Makefile.in
+@@ -23,9 +23,7 @@ vpath %.c \
+ $(srcdir)/src/third_party/libevent \
+ $(NULL)
+ else # } else {
+-# message_pump_libevent.cc includes third_party/libevent/event.h,
+-# which we put in $(DIST), see export rule below
+-LOCAL_INCLUDES += -I$(DIST)
++LOCAL_INCLUDES += $(MOZ_LIBEVENT_INCLUDES)
+ endif # }
+
+ vpath %.cc \
Added: branches/experimental/www/firefox-nightly/files/patch-ipc-chromium-src-base-message_pump_libevent.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-nightly/files/patch-ipc-chromium-src-base-message_pump_libevent.cc Fri Jun 15 05:42:07 2012 (r759)
@@ -0,0 +1,11 @@
+--- ipc/chromium/src/base/message_pump_libevent.cc~
++++ ipc/chromium/src/base/message_pump_libevent.cc
+@@ -15,7 +15,7 @@
+ #include "base/scoped_nsautorelease_pool.h"
+ #include "base/scoped_ptr.h"
+ #include "base/time.h"
+-#include "third_party/libevent/event.h"
++#include "event.h"
+
+ // Lifecycle of struct event
+ // Libevent uses two main data structures:
Modified: branches/experimental/www/firefox/files/patch-configure.in
==============================================================================
--- branches/experimental/www/firefox/files/patch-configure.in Fri Jun 15 00:58:30 2012 (r758)
+++ branches/experimental/www/firefox/files/patch-configure.in Fri Jun 15 05:42:07 2012 (r759)
@@ -18,7 +18,7 @@
INTEL_ARCHITECTURE=1
esac
-@@ -4410,6 +4410,9 @@ else
+@@ -4218,6 +4218,9 @@ else
NSPR_LIBS='`$(LIBXUL_DIST)/sdk/bin/nspr-config --prefix='${LIBXUL_DIST}' --libdir='${LIBXUL_DIST}'/lib --libs`'
fi
fi
@@ -28,7 +28,30 @@
dnl system libevent Support
dnl ========================================================
-@@ -4580,7 +4580,7 @@
+@@ -4230,6 +4233,9 @@
+ if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then
+ MOZ_NATIVE_LIBEVENT=
+ else
++PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent,
++ [MOZ_NATIVE_LIBEVENT=1
++ MOZ_LIBEVENT_INCLUDES="$MOZ_LIBEVENT_CFLAGS"], [
+ if test "${LIBEVENT_DIR}" = "yes"; then
+ LIBEVENT_DIR=/usr
+ fi
+@@ -4242,10 +4248,11 @@ else
+ AC_MSG_ERROR([--with-system-libevent requested but event.h not found]))
+ AC_CHECK_LIB(event, event_init,
+ [MOZ_NATIVE_LIBEVENT=1
+- MOZ_LIBEVENT_INCLUDES="${LIBEVENT_DIR}/include"
++ MOZ_LIBEVENT_INCLUDES="-I${LIBEVENT_DIR}/include"
+ MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"],
+ [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=])
+ fi
++])
+ CFLAGS=$_SAVE_CFLAGS
+ LDFLAGS=$_SAVE_LDFLAGS
+ LIBS=$_SAVE_LIBS
+@@ -4808,7 +4810,7 @@
LDFLAGS=$_SAVE_LDFLAGS
LIBS=$_SAVE_LIBS
Added: branches/experimental/www/firefox/files/patch-ipc-chromium-Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox/files/patch-ipc-chromium-Makefile.in Fri Jun 15 05:42:07 2012 (r759)
@@ -0,0 +1,13 @@
+--- ipc/chromium/Makefile.in~
++++ ipc/chromium/Makefile.in
+@@ -23,9 +23,7 @@ vpath %.c \
+ $(srcdir)/src/third_party/libevent \
+ $(NULL)
+ else # } else {
+-# message_pump_libevent.cc includes third_party/libevent/event.h,
+-# which we put in $(DIST), see export rule below
+-LOCAL_INCLUDES += -I$(DIST)
++LOCAL_INCLUDES += $(MOZ_LIBEVENT_INCLUDES)
+ endif # }
+
+ vpath %.cc \
Added: branches/experimental/www/firefox/files/patch-ipc-chromium-src-base-message_pump_libevent.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox/files/patch-ipc-chromium-src-base-message_pump_libevent.cc Fri Jun 15 05:42:07 2012 (r759)
@@ -0,0 +1,11 @@
+--- ipc/chromium/src/base/message_pump_libevent.cc~
++++ ipc/chromium/src/base/message_pump_libevent.cc
+@@ -15,7 +15,7 @@
+ #include "base/scoped_nsautorelease_pool.h"
+ #include "base/scoped_ptr.h"
+ #include "base/time.h"
+-#include "third_party/libevent/event.h"
++#include "event.h"
+
+ // Lifecycle of struct event
+ // Libevent uses two main data structures:
Modified: branches/experimental/www/libxul/files/patch-configure.in
==============================================================================
--- branches/experimental/www/libxul/files/patch-configure.in Fri Jun 15 00:58:30 2012 (r758)
+++ branches/experimental/www/libxul/files/patch-configure.in Fri Jun 15 05:42:07 2012 (r759)
@@ -55,6 +55,29 @@
dnl system libevent Support
dnl ========================================================
+@@ -4230,6 +4233,9 @@
+ if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then
+ MOZ_NATIVE_LIBEVENT=
+ else
++PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent,
++ [MOZ_NATIVE_LIBEVENT=1
++ MOZ_LIBEVENT_INCLUDES="$MOZ_LIBEVENT_CFLAGS"], [
+ if test "${LIBEVENT_DIR}" = "yes"; then
+ LIBEVENT_DIR=/usr
+ fi
+@@ -4242,10 +4248,11 @@ else
+ AC_MSG_ERROR([--with-system-libevent requested but event.h not found]))
+ AC_CHECK_LIB(event, event_init,
+ [MOZ_NATIVE_LIBEVENT=1
+- MOZ_LIBEVENT_INCLUDES="${LIBEVENT_DIR}/include"
++ MOZ_LIBEVENT_INCLUDES="-I${LIBEVENT_DIR}/include"
+ MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"],
+ [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=])
+ fi
++])
+ CFLAGS=$_SAVE_CFLAGS
+ LDFLAGS=$_SAVE_LDFLAGS
+ LIBS=$_SAVE_LIBS
@@ -4808,7 +4810,7 @@ CFLAGS=$_SAVE_CFLAGS
LDFLAGS=$_SAVE_LDFLAGS
LIBS=$_SAVE_LIBS
Added: branches/experimental/www/libxul/files/patch-ipc-chromium-Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/libxul/files/patch-ipc-chromium-Makefile.in Fri Jun 15 05:42:07 2012 (r759)
@@ -0,0 +1,13 @@
+--- ipc/chromium/Makefile.in~
++++ ipc/chromium/Makefile.in
+@@ -23,9 +23,7 @@ vpath %.c \
+ $(srcdir)/src/third_party/libevent \
+ $(NULL)
+ else # } else {
+-# message_pump_libevent.cc includes third_party/libevent/event.h,
+-# which we put in $(DIST), see export rule below
+-LOCAL_INCLUDES += -I$(DIST)
++LOCAL_INCLUDES += $(MOZ_LIBEVENT_INCLUDES)
+ endif # }
+
+ vpath %.cc \
Modified: branches/experimental/www/libxul/files/patch-ipc-chromium-src-base-message_pump_libevent.cc
==============================================================================
--- branches/experimental/www/libxul/files/patch-ipc-chromium-src-base-message_pump_libevent.cc Fri Jun 15 00:58:30 2012 (r758)
+++ branches/experimental/www/libxul/files/patch-ipc-chromium-src-base-message_pump_libevent.cc Fri Jun 15 05:42:07 2012 (r759)
@@ -8,3 +8,12 @@
#include "eintr_wrapper.h"
#include "base/logging.h"
+@@ -15,7 +15,7 @@
+ #include "base/scoped_nsautorelease_pool.h"
+ #include "base/scoped_ptr.h"
+ #include "base/time.h"
+-#include "third_party/libevent/event.h"
++#include "event.h"
+
+ // Lifecycle of struct event
+ // Libevent uses two main data structures:
Modified: branches/experimental/www/seamonkey-beta/files/patch-mozilla-configure.in
==============================================================================
--- branches/experimental/www/seamonkey-beta/files/patch-mozilla-configure.in Fri Jun 15 00:58:30 2012 (r758)
+++ branches/experimental/www/seamonkey-beta/files/patch-mozilla-configure.in Fri Jun 15 05:42:07 2012 (r759)
@@ -45,6 +45,29 @@
AC_DEFINE(HAVE_CLOCK_MONOTONIC)
AC_SUBST(HAVE_CLOCK_MONOTONIC)
AC_SUBST(REALTIME_LIBS)
+@@ -4230,6 +4233,9 @@
+ if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then
+ MOZ_NATIVE_LIBEVENT=
+ else
++PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent,
++ [MOZ_NATIVE_LIBEVENT=1
++ MOZ_LIBEVENT_INCLUDES="$MOZ_LIBEVENT_CFLAGS"], [
+ if test "${LIBEVENT_DIR}" = "yes"; then
+ LIBEVENT_DIR=/usr
+ fi
+@@ -4242,10 +4248,11 @@ else
+ AC_MSG_ERROR([--with-system-libevent requested but event.h not found]))
+ AC_CHECK_LIB(event, event_init,
+ [MOZ_NATIVE_LIBEVENT=1
+- MOZ_LIBEVENT_INCLUDES="${LIBEVENT_DIR}/include"
++ MOZ_LIBEVENT_INCLUDES="-I${LIBEVENT_DIR}/include"
+ MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"],
+ [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=])
+ fi
++])
+ CFLAGS=$_SAVE_CFLAGS
+ LDFLAGS=$_SAVE_LDFLAGS
+ LIBS=$_SAVE_LIBS
@@ -4808,7 +4810,7 @@ CFLAGS=$_SAVE_CFLAGS
LDFLAGS=$_SAVE_LDFLAGS
LIBS=$_SAVE_LIBS
Added: branches/experimental/www/seamonkey-beta/files/patch-mozilla-ipc-chromium-Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/seamonkey-beta/files/patch-mozilla-ipc-chromium-Makefile.in Fri Jun 15 05:42:07 2012 (r759)
@@ -0,0 +1,13 @@
+--- mozilla/ipc/chromium/Makefile.in~
++++ mozilla/ipc/chromium/Makefile.in
+@@ -23,9 +23,7 @@ vpath %.c \
+ $(srcdir)/src/third_party/libevent \
+ $(NULL)
+ else # } else {
+-# message_pump_libevent.cc includes third_party/libevent/event.h,
+-# which we put in $(DIST), see export rule below
+-LOCAL_INCLUDES += -I$(DIST)
++LOCAL_INCLUDES += $(MOZ_LIBEVENT_INCLUDES)
+ endif # }
+
+ vpath %.cc \
Added: branches/experimental/www/seamonkey-beta/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/seamonkey-beta/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc Fri Jun 15 05:42:07 2012 (r759)
@@ -0,0 +1,11 @@
+--- mozilla/ipc/chromium/src/base/message_pump_libevent.cc~
++++ mozilla/ipc/chromium/src/base/message_pump_libevent.cc
+@@ -15,7 +15,7 @@
+ #include "base/scoped_nsautorelease_pool.h"
+ #include "base/scoped_ptr.h"
+ #include "base/time.h"
+-#include "third_party/libevent/event.h"
++#include "event.h"
+
+ // Lifecycle of struct event
+ // Libevent uses two main data structures:
Modified: branches/experimental/www/seamonkey/files/patch-mozilla-configure.in
==============================================================================
--- branches/experimental/www/seamonkey/files/patch-mozilla-configure.in Fri Jun 15 00:58:30 2012 (r758)
+++ branches/experimental/www/seamonkey/files/patch-mozilla-configure.in Fri Jun 15 05:42:07 2012 (r759)
@@ -45,6 +45,29 @@
AC_DEFINE(HAVE_CLOCK_MONOTONIC)
AC_SUBST(HAVE_CLOCK_MONOTONIC)
AC_SUBST(REALTIME_LIBS)
+@@ -4230,6 +4233,9 @@
+ if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then
+ MOZ_NATIVE_LIBEVENT=
+ else
++PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent,
++ [MOZ_NATIVE_LIBEVENT=1
++ MOZ_LIBEVENT_INCLUDES="$MOZ_LIBEVENT_CFLAGS"], [
+ if test "${LIBEVENT_DIR}" = "yes"; then
+ LIBEVENT_DIR=/usr
+ fi
+@@ -4242,10 +4248,11 @@ else
+ AC_MSG_ERROR([--with-system-libevent requested but event.h not found]))
+ AC_CHECK_LIB(event, event_init,
+ [MOZ_NATIVE_LIBEVENT=1
+- MOZ_LIBEVENT_INCLUDES="${LIBEVENT_DIR}/include"
++ MOZ_LIBEVENT_INCLUDES="-I${LIBEVENT_DIR}/include"
+ MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"],
+ [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=])
+ fi
++])
+ CFLAGS=$_SAVE_CFLAGS
+ LDFLAGS=$_SAVE_LDFLAGS
+ LIBS=$_SAVE_LIBS
@@ -4808,7 +4810,7 @@ CFLAGS=$_SAVE_CFLAGS
LDFLAGS=$_SAVE_LDFLAGS
LIBS=$_SAVE_LIBS
Added: branches/experimental/www/seamonkey/files/patch-mozilla-ipc-chromium-Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/seamonkey/files/patch-mozilla-ipc-chromium-Makefile.in Fri Jun 15 05:42:07 2012 (r759)
@@ -0,0 +1,13 @@
+--- mozilla/ipc/chromium/Makefile.in~
++++ mozilla/ipc/chromium/Makefile.in
+@@ -23,9 +23,7 @@ vpath %.c \
+ $(srcdir)/src/third_party/libevent \
+ $(NULL)
+ else # } else {
+-# message_pump_libevent.cc includes third_party/libevent/event.h,
+-# which we put in $(DIST), see export rule below
+-LOCAL_INCLUDES += -I$(DIST)
++LOCAL_INCLUDES += $(MOZ_LIBEVENT_INCLUDES)
+ endif # }
+
+ vpath %.cc \
Added: branches/experimental/www/seamonkey/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/seamonkey/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc Fri Jun 15 05:42:07 2012 (r759)
@@ -0,0 +1,11 @@
+--- mozilla/ipc/chromium/src/base/message_pump_libevent.cc~
++++ mozilla/ipc/chromium/src/base/message_pump_libevent.cc
+@@ -15,7 +15,7 @@
+ #include "base/scoped_nsautorelease_pool.h"
+ #include "base/scoped_ptr.h"
+ #include "base/time.h"
+-#include "third_party/libevent/event.h"
++#include "event.h"
+
+ // Lifecycle of struct event
+ // Libevent uses two main data structures:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201206150542.q5F5g78L033740>