diff options
| author | Florian Smeets <flo@FreeBSD.org> | 2012-09-07 22:10:01 +0000 |
|---|---|---|
| committer | Florian Smeets <flo@FreeBSD.org> | 2012-09-07 22:10:01 +0000 |
| commit | 9e2d4844cf86e9e0c1fee084c644a471b97d4d89 (patch) | |
| tree | 260671c3ea7a2a410e3f9cc7f050e3a71604a633 /mail/thunderbird/files/patch-bug788039 | |
| parent | Add a sanity check to ensure vuxml is actually installed prior to performing (diff) | |
- Update firefox to 15.0.1
- Sync changes from gecko repository@r995
general
- don't specify prefix for libevent when using pkg-config
- ia64 and sparc64 use 8k pagesize by default
- add visibility hack for clang 3.2 with libc++
- fix build using clang 3.2 (on FreeBSD 10-CURRENT)
- rename a few more patches to ease tracking of bugzilla bugs
www/seamonkey
- unbreak unsetting LDAP and MAILNEWS options after bug 707305
- use compile time debugging WITH_DEBUG
security/nss
- unbreak install WITH_DEBUG
- unbreak powerpc64
devel/nspr
- use absolute paths when specifiying srcdir to make gdb(1) happy
In collaboration with: andreast, zeising, Jan Beich <jbeich@tormail.org>
Diffstat (limited to 'mail/thunderbird/files/patch-bug788039')
| -rw-r--r-- | mail/thunderbird/files/patch-bug788039 | 59 |
1 files changed, 59 insertions, 0 deletions
diff --git a/mail/thunderbird/files/patch-bug788039 b/mail/thunderbird/files/patch-bug788039 new file mode 100644 index 000000000000..c42105d133c4 --- /dev/null +++ b/mail/thunderbird/files/patch-bug788039 @@ -0,0 +1,59 @@ +# Bug 788039 - With no prefix search libevent via pkg-config. + +--- mozilla/config/autoconf.mk.in~ ++++ mozilla/config/autoconf.mk.in +@@ -227,7 +227,7 @@ MOZ_HUNSPELL_CFLAGS = @MOZ_HUNSPELL_CFLA + + MOZ_NATIVE_LIBEVENT = @MOZ_NATIVE_LIBEVENT@ + MOZ_LIBEVENT_LIBS = @MOZ_LIBEVENT_LIBS@ +-MOZ_LIBEVENT_INCLUDES = @MOZ_LIBEVENT_INCLUDES@ ++MOZ_LIBEVENT_CFLAGS = @MOZ_LIBEVENT_CFLAGS@ + + MOZ_NATIVE_LIBVPX = @MOZ_NATIVE_LIBVPX@ + MOZ_LIBVPX_LIBS = @MOZ_LIBVPX_LIBS@ +--- mozilla/configure.in~ ++++ mozilla/configure.in +@@ -3854,7 +3854,7 @@ fi + dnl system libevent Support + dnl ======================================================== + MOZ_ARG_WITH_STRING(system-libevent, +-[ --with-system-libevent=[PFX] ++[ --with-system-libevent[=PFX] + Use system libevent [installed at prefix PFX]], + LIBEVENT_DIR=$withval) + +@@ -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 +- 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, + [MOZ_NATIVE_LIBEVENT=1 +- MOZ_LIBEVENT_INCLUDES="${LIBEVENT_DIR}/include" ++ MOZ_LIBEVENT_CFLAGS="-I${LIBEVENT_DIR}/include" + MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"], +- [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=]) ++ [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_CFLAGS= MOZ_LIBEVENT_LIBS=]) + fi + CFLAGS=$_SAVE_CFLAGS + LDFLAGS=$_SAVE_LDFLAGS + LIBS=$_SAVE_LIBS + + AC_SUBST(MOZ_NATIVE_LIBEVENT) +-AC_SUBST(MOZ_LIBEVENT_INCLUDES) ++AC_SUBST(MOZ_LIBEVENT_CFLAGS) + AC_SUBST(MOZ_LIBEVENT_LIBS) + + dnl ======================================================== |