Date: Sat, 9 Jun 2012 01:51:58 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r743 - in branches/experimental: Mk www/firefox-nightly/files Message-ID: <201206090151.q591pwvW065881@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Sat Jun 9 01:51:58 2012
New Revision: 743
Log:
remove remnants from/intended for libevent2 patch
Deleted:
branches/experimental/www/firefox-nightly/files/extra-libevent2-patch-configure.in
Modified:
branches/experimental/Mk/bsd.gecko.mk
Modified: branches/experimental/Mk/bsd.gecko.mk
==============================================================================
--- branches/experimental/Mk/bsd.gecko.mk Sat Jun 9 01:50:07 2012 (r742)
+++ branches/experimental/Mk/bsd.gecko.mk Sat Jun 9 01:51:58 2012 (r743)
@@ -787,9 +787,6 @@
s|"%FULL_NSPR_LIBS%"|`nspr-config --libs`|g' \
${MOZSRC}/build/unix/mozilla-config.in
.endif
-.for subdir in config/system_wrappers nsprpub/config/system_wrappers js/src/config/system_wrappers_js
- @${MKDIR} ${MOZSRC}/${subdir}
-.endfor
.for subdir in "" nsprpub js/src
@if [ -f ${MOZSRC}/${subdir}/config/system-headers ] ; then \
${ECHO_CMD} "fenv.h" >> ${MOZSRC}/${subdir}/config/system-headers ; \
Deleted: branches/experimental/www/firefox-nightly/files/extra-libevent2-patch-configure.in
==============================================================================
--- branches/experimental/www/firefox-nightly/files/extra-libevent2-patch-configure.in Sat Jun 9 01:51:58 2012 (r742)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,27 +0,0 @@
---- configure.in.orig 2010-11-04 21:05:18.000000000 +0100
-+++ configure.in 2010-11-09 12:59:28.000000000 +0100
-@@ -4019,17 +4019,17 @@ else
- if test "${LIBEVENT_DIR}" = "yes"; then
- LIBEVENT_DIR=/usr
- fi
-- CFLAGS="-I${LIBEVENT_DIR}/include $CFLAGS"
-- LDFLAGS="-L${LIBEVENT_DIR}/lib $LDFLAGS"
-+ CFLAGS="-I${LIBEVENT_DIR}/include/event2 -I${LIBEVENT_DIR}/include/event2/compat $CFLAGS"
-+ LDFLAGS="-L${LIBEVENT_DIR}/lib/event2 $LDFLAGS"
- MOZ_CHECK_HEADER(event.h,
-- [if test ! -f "${LIBEVENT_DIR}/include/event.h"; then
-- AC_MSG_ERROR([event.h found, but is not in ${LIBEVENT_DIR}/include])
-+ [if test ! -f "${LIBEVENT_DIR}/include/event2/event.h"; then
-+ AC_MSG_ERROR([event.h found, but is not in ${LIBEVENT_DIR}/include/event2])
- fi],
- AC_MSG_ERROR([--with-system-libevent requested but event.h not found]))
-- AC_CHECK_LIB(event, event_init,
-+ AC_CHECK_LIB(event-2.0, event_init,
- [MOZ_NATIVE_LIBEVENT=1
-- MOZ_LIBEVENT_INCLUDES="${LIBEVENT_DIR}/include"
-- MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"],
-+ MOZ_LIBEVENT_INCLUDES="${LIBEVENT_DIR}/include/event2 ${LIBEVENT_DIR}/include/event2/compat"
-+ MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib/event2 -levent-2.0"],
- [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=])
- fi
- CFLAGS=$_SAVE_CFLAGS
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201206090151.q591pwvW065881>