Date: Tue, 17 Aug 2010 07:44:27 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r382 - branches/experimental/Mk trunk/Mk Message-ID: <201008170744.o7H7iRnN016845@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: beat
Date: Tue Aug 17 07:44:27 2010
New Revision: 382
Log:
- Prepare bsd.gecko.mk to unbreak gecko ports with recent versions of GCC
PR: ports/142736
Submitted by: bf <bf1783 AT gmail.com>
Modified:
branches/experimental/Mk/bsd.gecko.mk
trunk/Mk/bsd.gecko.mk
Modified: branches/experimental/Mk/bsd.gecko.mk
==============================================================================
--- branches/experimental/Mk/bsd.gecko.mk Thu Aug 12 11:28:29 2010 (r381)
+++ branches/experimental/Mk/bsd.gecko.mk Tue Aug 17 07:44:27 2010 (r382)
@@ -612,9 +612,19 @@
${MOZSRC}/build/unix/mozilla-config.in
.endif
@${REINPLACE_CMD} -e 's|<iconv.h>|\"${LOCALBASE}/include/iconv.h\"|g' \
- ${WRKSRC}/configure \
- ${MOZSRC}/intl/uconv/native/nsNativeUConvService.cpp \
- ${MOZSRC}/xpcom/io/nsNativeCharsetUtils.cpp
+ ${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
+.endfor
+.for subdir in "" nsprpub js/src
+ @if [ -f ${MOZSRC}/${subdir}/config/system-headers ] ; then \
+ ${ECHO_CMD} "fenv.h" >> ${MOZSRC}/${subdir}/config/system-headers ; \
+ fi
+.endfor
@${REINPLACE_CMD} -e 's|%%MOZILLA%%|${MOZILLA}|g' \
${WRKSRC}/config/autoconf.mk.in
@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g ; \
Modified: trunk/Mk/bsd.gecko.mk
==============================================================================
--- trunk/Mk/bsd.gecko.mk Thu Aug 12 11:28:29 2010 (r381)
+++ trunk/Mk/bsd.gecko.mk Tue Aug 17 07:44:27 2010 (r382)
@@ -505,9 +505,19 @@
${MOZSRC}/build/unix/mozilla-config.in
.endif
@${REINPLACE_CMD} -e 's|<iconv.h>|\"${LOCALBASE}/include/iconv.h\"|g' \
- ${WRKSRC}/configure \
- ${MOZSRC}/intl/uconv/native/nsNativeUConvService.cpp \
- ${MOZSRC}/xpcom/io/nsNativeCharsetUtils.cpp
+ ${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
+.endfor
+.for subdir in "" nsprpub js/src
+ @if [ -f ${MOZSRC}/${subdir}/config/system-headers ] ; then \
+ ${ECHO_CMD} "fenv.h" >> ${MOZSRC}/${subdir}/config/system-headers ; \
+ fi
+.endfor
@${REINPLACE_CMD} -e 's|%%MOZILLA%%|${MOZILLA}|g' \
${WRKSRC}/config/autoconf.mk.in
@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g ; \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201008170744.o7H7iRnN016845>