Date: Sun, 23 Oct 2011 00:20:12 GMT From: Nali Toja <nalitoja@gmail.com> To: gecko@FreeBSD.org Subject: Re: ports/161421: [patch] www/firefox: use libevent2 Message-ID: <201110230020.p9N0KC0J054028@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/161421; it has been noted by GNATS.
From: Nali Toja <nalitoja@gmail.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Re: ports/161421: [patch] www/firefox: use libevent2
Date: Sun, 23 Oct 2011 00:18:37 +0000
--=-=-=
Content-Type: text/plain
Nali Toja <nalitoja@gmail.com> writes:
> +++ Mk/bsd.gecko.mk 9 Oct 2011 09:23:18 -0000
> @@ -775,6 +782,10 @@
> @${ECHO_CMD} "#pragma GCC visibility push(default)" >> ${MOZSRC}/${subdir}/iconv.h
> @${ECHO_CMD} "#include \"${LOCALBASE}/include/iconv.h\"" >> ${MOZSRC}/${subdir}/iconv.h
> @${ECHO_CMD} "#pragma GCC visibility pop" >> ${MOZSRC}/${subdir}/iconv.h
> + @${ECHO_CMD} "#pragma GCC system_header" >> ${MOZSRC}/${subdir}/event.h
> + @${ECHO_CMD} "#pragma GCC visibility push(default)" >> ${MOZSRC}/${subdir}/event.h
> + @${ECHO_CMD} "#include <event2/compat/event.h>" >> ${MOZSRC}/${subdir}/event.h
> + @${ECHO_CMD} "#pragma GCC visibility pop" >> ${MOZSRC}/${subdir}/event.h
Here is a better version for this hunk, including <evutil.h> fix.
--=-=-=
Content-Type: text/x-patch
Content-Disposition: attachment; filename=h.diff
Index: Mk/bsd.gecko.mk
===================================================================
RCS file: /a/.csup/ports/Mk/bsd.gecko.mk,v
retrieving revision 1.42
diff -u -p -r1.42 bsd.gecko.mk
--- Mk/bsd.gecko.mk 28 Sep 2011 03:14:22 -0000 1.42
+++ Mk/bsd.gecko.mk 9 Oct 2011 09:23:18 -0000
@@ -764,10 +774,14 @@ gecko-post-patch:
${WRKSRC}/configure
.for subdir in config/system_wrappers nsprpub/config/system_wrappers js/src/config/system_wrappers_js
@${MKDIR} ${MOZSRC}/${subdir}
- @${ECHO_CMD} "#pragma GCC system_header" >> ${MOZSRC}/${subdir}/iconv.h
- @${ECHO_CMD} "#pragma GCC visibility push(default)" >> ${MOZSRC}/${subdir}/iconv.h
- @${ECHO_CMD} "#include \"${LOCALBASE}/include/iconv.h\"" >> ${MOZSRC}/${subdir}/iconv.h
- @${ECHO_CMD} "#pragma GCC visibility pop" >> ${MOZSRC}/${subdir}/iconv.h
+.for h in iconv.h:\"${LOCALBASE}/include/iconv.h\" \
+ event.h:<event2/compat/event.h> \
+ evutil.h:<event2/compat/evutil.h>
+ @${ECHO_CMD} "#pragma GCC system_header" >> ${MOZSRC}/${subdir}/${h:C/:.*//}
+ @${ECHO_CMD} "#pragma GCC visibility push(default)" >> ${MOZSRC}/${subdir}/${h:C/:.*//}
+ @${ECHO_CMD} "#include ${h:C/.*://}" >> ${MOZSRC}/${subdir}/${h:C/:.*//}
+ @${ECHO_CMD} "#pragma GCC visibility pop" >> ${MOZSRC}/${subdir}/${h:C/:.*//}
+.endfor
.endfor
.for subdir in "" nsprpub js/src
@if [ -f ${MOZSRC}/${subdir}/config/system-headers ] ; then \
--=-=-=--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201110230020.p9N0KC0J054028>