From 817bbe5ae9aa15c13065e740451bcc6cad9b4d74 Mon Sep 17 00:00:00 2001 From: Beat Gaetzi Date: Sun, 29 Aug 2010 15:16:20 +0000 Subject: [PATCH] - Prepare bsd.gecko.mk to unbreak gecko ports with recent versions of GCC PR: ports/142736 Submitted by: bf --- Mk/bsd.gecko.mk | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk index f379f4bada4f..ca56af41b423 100644 --- a/Mk/bsd.gecko.mk +++ b/Mk/bsd.gecko.mk @@ -505,9 +505,19 @@ gecko-post-patch: ${MOZSRC}/build/unix/mozilla-config.in .endif @${REINPLACE_CMD} -e 's||\"${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 ; \