Date: Tue, 4 Sep 2012 07:38:14 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r982 - in trunk: Mk 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: <201209040738.q847cE0F021987@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Tue Sep 4 07:38:14 2012
New Revision: 982
Log:
don't specify prefix for libevent when using pkg-config
libevent-2.0:
event_LIB_DEPENDS= event-2.0:${PORTSDIR}/devel/libevent2
event_MOZ_OPTIONS= --with-system-libevent
libevent-1.4:
event_LIB_DEPENDS= event-1.4:${PORTSDIR}/devel/libevent
event_MOZ_OPTIONS= --with-system-libevent=${LOCALBASE}
Modified:
trunk/Mk/bsd.gecko.mk
trunk/mail/thunderbird-esr/files/patch-bug788039
trunk/mail/thunderbird/files/patch-bug788039
trunk/www/firefox-esr/files/patch-bug788039
trunk/www/firefox-nightly/files/patch-bug788039
trunk/www/firefox/files/patch-bug788039
trunk/www/libxul/files/patch-bug788039
trunk/www/seamonkey/files/patch-bug788039
Modified: trunk/Mk/bsd.gecko.mk
==============================================================================
--- trunk/Mk/bsd.gecko.mk Tue Sep 4 04:48:58 2012 (r981)
+++ trunk/Mk/bsd.gecko.mk Tue Sep 4 07:38:14 2012 (r982)
@@ -560,7 +560,7 @@
dbm_EXTRACT_AFTER_ARGS= --exclude mozilla*/dbm
event_LIB_DEPENDS= event-2.0:${PORTSDIR}/devel/libevent2
-event_MOZ_OPTIONS= --with-system-libevent=${LOCALBASE}
+event_MOZ_OPTIONS= --with-system-libevent
event_EXTRACT_AFTER_ARGS= --exclude mozilla*/ipc/chromium/src/third_party/libevent
ffi_LIB_DEPENDS= ffi:${PORTSDIR}/devel/libffi
Modified: trunk/mail/thunderbird-esr/files/patch-bug788039
==============================================================================
--- trunk/mail/thunderbird-esr/files/patch-bug788039 Tue Sep 4 04:48:58 2012 (r981)
+++ trunk/mail/thunderbird-esr/files/patch-bug788039 Tue Sep 4 07:38:14 2012 (r982)
@@ -1,4 +1,4 @@
-# Bug 788039 - Also use pkg-config when searching for libevent.
+# Bug 788039 - With no prefix search libevent via pkg-config.
--- mozilla/config/autoconf.mk.in~
+++ mozilla/config/autoconf.mk.in
@@ -22,14 +22,21 @@
Use system libevent [installed at prefix PFX]],
LIBEVENT_DIR=$withval)
-@@ -3864,6 +3864,7 @@ _SAVE_LIBS=$LIBS
+@@ -3863,10 +3863,11 @@ _SAVE_LDFLAGS=$LDFLAGS
+ _SAVE_LIBS=$LIBS
if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then
MOZ_NATIVE_LIBEVENT=
++elif test "$LIBEVENT_DIR" = yes; then
++ PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent,
++ MOZ_NATIVE_LIBEVENT=1,
++ AC_MSG_ERROR([--with-system-libevent requested but libevent package not found]))
else
-+ PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent, MOZ_NATIVE_LIBEVENT=1, [
- if test "${LIBEVENT_DIR}" = "yes"; then
- LIBEVENT_DIR=/usr
- fi
+- if test "${LIBEVENT_DIR}" = "yes"; then
+- LIBEVENT_DIR=/usr
+- fi
+ CFLAGS="-I${LIBEVENT_DIR}/include $CFLAGS"
+ LDFLAGS="-L${LIBEVENT_DIR}/lib $LDFLAGS"
+ MOZ_CHECK_HEADER(event.h,
@@ -3876,16 +3877,16 @@ else
AC_MSG_ERROR([--with-system-libevent requested but event.h not found]))
AC_CHECK_LIB(event, event_init,
@@ -38,9 +45,8 @@
+ MOZ_LIBEVENT_CFLAGS="-I${LIBEVENT_DIR}/include"
MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"],
- [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=])
--fi
+ [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_CFLAGS= MOZ_LIBEVENT_LIBS=])
-+fi])
+ fi
CFLAGS=$_SAVE_CFLAGS
LDFLAGS=$_SAVE_LDFLAGS
LIBS=$_SAVE_LIBS
Modified: trunk/mail/thunderbird/files/patch-bug788039
==============================================================================
--- trunk/mail/thunderbird/files/patch-bug788039 Tue Sep 4 04:48:58 2012 (r981)
+++ trunk/mail/thunderbird/files/patch-bug788039 Tue Sep 4 07:38:14 2012 (r982)
@@ -1,4 +1,4 @@
-# Bug 788039 - Also use pkg-config when searching for libevent.
+# Bug 788039 - With no prefix search libevent via pkg-config.
--- mozilla/config/autoconf.mk.in~
+++ mozilla/config/autoconf.mk.in
@@ -22,14 +22,21 @@
Use system libevent [installed at prefix PFX]],
LIBEVENT_DIR=$withval)
-@@ -3864,6 +3864,7 @@ _SAVE_LIBS=$LIBS
+@@ -3863,10 +3863,11 @@ _SAVE_LDFLAGS=$LDFLAGS
+ _SAVE_LIBS=$LIBS
if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then
MOZ_NATIVE_LIBEVENT=
++elif test "$LIBEVENT_DIR" = yes; then
++ PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent,
++ MOZ_NATIVE_LIBEVENT=1,
++ AC_MSG_ERROR([--with-system-libevent requested but libevent package not found]))
else
-+ PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent, MOZ_NATIVE_LIBEVENT=1, [
- if test "${LIBEVENT_DIR}" = "yes"; then
- LIBEVENT_DIR=/usr
- fi
+- if test "${LIBEVENT_DIR}" = "yes"; then
+- LIBEVENT_DIR=/usr
+- fi
+ CFLAGS="-I${LIBEVENT_DIR}/include $CFLAGS"
+ LDFLAGS="-L${LIBEVENT_DIR}/lib $LDFLAGS"
+ MOZ_CHECK_HEADER(event.h,
@@ -3876,16 +3877,16 @@ else
AC_MSG_ERROR([--with-system-libevent requested but event.h not found]))
AC_CHECK_LIB(event, event_init,
@@ -38,9 +45,8 @@
+ MOZ_LIBEVENT_CFLAGS="-I${LIBEVENT_DIR}/include"
MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"],
- [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=])
--fi
+ [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_CFLAGS= MOZ_LIBEVENT_LIBS=])
-+fi])
+ fi
CFLAGS=$_SAVE_CFLAGS
LDFLAGS=$_SAVE_LDFLAGS
LIBS=$_SAVE_LIBS
Modified: trunk/www/firefox-esr/files/patch-bug788039
==============================================================================
--- trunk/www/firefox-esr/files/patch-bug788039 Tue Sep 4 04:48:58 2012 (r981)
+++ trunk/www/firefox-esr/files/patch-bug788039 Tue Sep 4 07:38:14 2012 (r982)
@@ -1,4 +1,4 @@
-# Bug 788039 - Also use pkg-config when searching for libevent.
+# Bug 788039 - With no prefix search libevent via pkg-config.
--- config/autoconf.mk.in~
+++ config/autoconf.mk.in
@@ -22,14 +22,21 @@
Use system libevent [installed at prefix PFX]],
LIBEVENT_DIR=$withval)
-@@ -3864,6 +3864,7 @@ _SAVE_LIBS=$LIBS
+@@ -3863,10 +3863,11 @@ _SAVE_LDFLAGS=$LDFLAGS
+ _SAVE_LIBS=$LIBS
if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then
MOZ_NATIVE_LIBEVENT=
++elif test "$LIBEVENT_DIR" = yes; then
++ PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent,
++ MOZ_NATIVE_LIBEVENT=1,
++ AC_MSG_ERROR([--with-system-libevent requested but libevent package not found]))
else
-+ PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent, MOZ_NATIVE_LIBEVENT=1, [
- if test "${LIBEVENT_DIR}" = "yes"; then
- LIBEVENT_DIR=/usr
- fi
+- if test "${LIBEVENT_DIR}" = "yes"; then
+- LIBEVENT_DIR=/usr
+- fi
+ CFLAGS="-I${LIBEVENT_DIR}/include $CFLAGS"
+ LDFLAGS="-L${LIBEVENT_DIR}/lib $LDFLAGS"
+ MOZ_CHECK_HEADER(event.h,
@@ -3876,16 +3877,16 @@ else
AC_MSG_ERROR([--with-system-libevent requested but event.h not found]))
AC_CHECK_LIB(event, event_init,
@@ -38,9 +45,8 @@
+ MOZ_LIBEVENT_CFLAGS="-I${LIBEVENT_DIR}/include"
MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"],
- [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=])
--fi
+ [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_CFLAGS= MOZ_LIBEVENT_LIBS=])
-+fi])
+ fi
CFLAGS=$_SAVE_CFLAGS
LDFLAGS=$_SAVE_LDFLAGS
LIBS=$_SAVE_LIBS
Modified: trunk/www/firefox-nightly/files/patch-bug788039
==============================================================================
--- trunk/www/firefox-nightly/files/patch-bug788039 Tue Sep 4 04:48:58 2012 (r981)
+++ trunk/www/firefox-nightly/files/patch-bug788039 Tue Sep 4 07:38:14 2012 (r982)
@@ -1,4 +1,4 @@
-# Bug 788039 - Also use pkg-config when searching for libevent.
+# Bug 788039 - With no prefix search libevent via pkg-config.
--- configure.in
+++ configure.in
@@ -11,14 +11,21 @@
Use system libevent [installed at prefix PFX]],
LIBEVENT_DIR=$withval)
-@@ -3864,6 +3864,7 @@ _SAVE_LIBS=$LIBS
+@@ -3863,10 +3863,11 @@ _SAVE_LDFLAGS=$LDFLAGS
+ _SAVE_LIBS=$LIBS
if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then
MOZ_NATIVE_LIBEVENT=
++elif test "$LIBEVENT_DIR" = yes; then
++ PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent,
++ MOZ_NATIVE_LIBEVENT=1,
++ AC_MSG_ERROR([--with-system-libevent requested but libevent package not found]))
else
-+ PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent, MOZ_NATIVE_LIBEVENT=1, [
- if test "${LIBEVENT_DIR}" = "yes"; then
- LIBEVENT_DIR=/usr
- fi
+- if test "${LIBEVENT_DIR}" = "yes"; then
+- LIBEVENT_DIR=/usr
+- fi
+ CFLAGS="-I${LIBEVENT_DIR}/include $CFLAGS"
+ LDFLAGS="-L${LIBEVENT_DIR}/lib $LDFLAGS"
+ MOZ_CHECK_HEADER(event.h,
@@ -3876,16 +3877,16 @@ else
AC_MSG_ERROR([--with-system-libevent requested but event.h not found]))
AC_CHECK_LIB(event, event_init,
@@ -27,9 +34,8 @@
+ MOZ_LIBEVENT_CFLAGS="-I${LIBEVENT_DIR}/include"
MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"],
- [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=])
--fi
+ [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_CFLAGS= MOZ_LIBEVENT_LIBS=])
-+fi])
+ fi
CFLAGS=$_SAVE_CFLAGS
LDFLAGS=$_SAVE_LDFLAGS
LIBS=$_SAVE_LIBS
Modified: trunk/www/firefox/files/patch-bug788039
==============================================================================
--- trunk/www/firefox/files/patch-bug788039 Tue Sep 4 04:48:58 2012 (r981)
+++ trunk/www/firefox/files/patch-bug788039 Tue Sep 4 07:38:14 2012 (r982)
@@ -1,4 +1,4 @@
-# Bug 788039 - Also use pkg-config when searching for libevent.
+# Bug 788039 - With no prefix search libevent via pkg-config.
--- config/autoconf.mk.in~
+++ config/autoconf.mk.in
@@ -22,14 +22,21 @@
Use system libevent [installed at prefix PFX]],
LIBEVENT_DIR=$withval)
-@@ -3864,6 +3864,7 @@ _SAVE_LIBS=$LIBS
+@@ -3863,10 +3863,11 @@ _SAVE_LDFLAGS=$LDFLAGS
+ _SAVE_LIBS=$LIBS
if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then
MOZ_NATIVE_LIBEVENT=
++elif test "$LIBEVENT_DIR" = yes; then
++ PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent,
++ MOZ_NATIVE_LIBEVENT=1,
++ AC_MSG_ERROR([--with-system-libevent requested but libevent package not found]))
else
-+ PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent, MOZ_NATIVE_LIBEVENT=1, [
- if test "${LIBEVENT_DIR}" = "yes"; then
- LIBEVENT_DIR=/usr
- fi
+- if test "${LIBEVENT_DIR}" = "yes"; then
+- LIBEVENT_DIR=/usr
+- fi
+ CFLAGS="-I${LIBEVENT_DIR}/include $CFLAGS"
+ LDFLAGS="-L${LIBEVENT_DIR}/lib $LDFLAGS"
+ MOZ_CHECK_HEADER(event.h,
@@ -3876,16 +3877,16 @@ else
AC_MSG_ERROR([--with-system-libevent requested but event.h not found]))
AC_CHECK_LIB(event, event_init,
@@ -38,9 +45,8 @@
+ MOZ_LIBEVENT_CFLAGS="-I${LIBEVENT_DIR}/include"
MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"],
- [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=])
--fi
+ [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_CFLAGS= MOZ_LIBEVENT_LIBS=])
-+fi])
+ fi
CFLAGS=$_SAVE_CFLAGS
LDFLAGS=$_SAVE_LDFLAGS
LIBS=$_SAVE_LIBS
Modified: trunk/www/libxul/files/patch-bug788039
==============================================================================
--- trunk/www/libxul/files/patch-bug788039 Tue Sep 4 04:48:58 2012 (r981)
+++ trunk/www/libxul/files/patch-bug788039 Tue Sep 4 07:38:14 2012 (r982)
@@ -1,4 +1,4 @@
-# Bug 788039 - Also use pkg-config when searching for libevent.
+# Bug 788039 - With no prefix search libevent via pkg-config.
--- config/autoconf.mk.in~
+++ config/autoconf.mk.in
@@ -22,14 +22,21 @@
Use system libevent [installed at prefix PFX]],
LIBEVENT_DIR=$withval)
-@@ -3864,6 +3864,7 @@ _SAVE_LIBS=$LIBS
+@@ -3863,10 +3863,11 @@ _SAVE_LDFLAGS=$LDFLAGS
+ _SAVE_LIBS=$LIBS
if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then
MOZ_NATIVE_LIBEVENT=
++elif test "$LIBEVENT_DIR" = yes; then
++ PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent,
++ MOZ_NATIVE_LIBEVENT=1,
++ AC_MSG_ERROR([--with-system-libevent requested but libevent package not found]))
else
-+ PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent, MOZ_NATIVE_LIBEVENT=1, [
- if test "${LIBEVENT_DIR}" = "yes"; then
- LIBEVENT_DIR=/usr
- fi
+- if test "${LIBEVENT_DIR}" = "yes"; then
+- LIBEVENT_DIR=/usr
+- fi
+ CFLAGS="-I${LIBEVENT_DIR}/include $CFLAGS"
+ LDFLAGS="-L${LIBEVENT_DIR}/lib $LDFLAGS"
+ MOZ_CHECK_HEADER(event.h,
@@ -3876,16 +3877,16 @@ else
AC_MSG_ERROR([--with-system-libevent requested but event.h not found]))
AC_CHECK_LIB(event, event_init,
@@ -38,9 +45,8 @@
+ MOZ_LIBEVENT_CFLAGS="-I${LIBEVENT_DIR}/include"
MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"],
- [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=])
--fi
+ [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_CFLAGS= MOZ_LIBEVENT_LIBS=])
-+fi])
+ fi
CFLAGS=$_SAVE_CFLAGS
LDFLAGS=$_SAVE_LDFLAGS
LIBS=$_SAVE_LIBS
Modified: trunk/www/seamonkey/files/patch-bug788039
==============================================================================
--- trunk/www/seamonkey/files/patch-bug788039 Tue Sep 4 04:48:58 2012 (r981)
+++ trunk/www/seamonkey/files/patch-bug788039 Tue Sep 4 07:38:14 2012 (r982)
@@ -1,4 +1,4 @@
-# Bug 788039 - Also use pkg-config when searching for libevent.
+# Bug 788039 - With no prefix search libevent via pkg-config.
--- mozilla/config/autoconf.mk.in~
+++ mozilla/config/autoconf.mk.in
@@ -22,14 +22,21 @@
Use system libevent [installed at prefix PFX]],
LIBEVENT_DIR=$withval)
-@@ -3864,6 +3864,7 @@ _SAVE_LIBS=$LIBS
+@@ -3863,10 +3863,11 @@ _SAVE_LDFLAGS=$LDFLAGS
+ _SAVE_LIBS=$LIBS
if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then
MOZ_NATIVE_LIBEVENT=
++elif test "$LIBEVENT_DIR" = yes; then
++ PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent,
++ MOZ_NATIVE_LIBEVENT=1,
++ AC_MSG_ERROR([--with-system-libevent requested but libevent package not found]))
else
-+ PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent, MOZ_NATIVE_LIBEVENT=1, [
- if test "${LIBEVENT_DIR}" = "yes"; then
- LIBEVENT_DIR=/usr
- fi
+- if test "${LIBEVENT_DIR}" = "yes"; then
+- LIBEVENT_DIR=/usr
+- fi
+ CFLAGS="-I${LIBEVENT_DIR}/include $CFLAGS"
+ LDFLAGS="-L${LIBEVENT_DIR}/lib $LDFLAGS"
+ MOZ_CHECK_HEADER(event.h,
@@ -3876,16 +3877,16 @@ else
AC_MSG_ERROR([--with-system-libevent requested but event.h not found]))
AC_CHECK_LIB(event, event_init,
@@ -38,9 +45,8 @@
+ MOZ_LIBEVENT_CFLAGS="-I${LIBEVENT_DIR}/include"
MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"],
- [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=])
--fi
+ [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_CFLAGS= MOZ_LIBEVENT_LIBS=])
-+fi])
+ fi
CFLAGS=$_SAVE_CFLAGS
LDFLAGS=$_SAVE_LDFLAGS
LIBS=$_SAVE_LIBS
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201209040738.q847cE0F021987>