From owner-freebsd-gecko@FreeBSD.ORG Thu Nov 4 20:49:00 2010 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6C4301065670 for ; Thu, 4 Nov 2010 20:49:00 +0000 (UTC) (envelope-from swell.k@gmail.com) Received: from mail-fx0-f54.google.com (mail-fx0-f54.google.com [209.85.161.54]) by mx1.freebsd.org (Postfix) with ESMTP id EDD2A8FC19 for ; Thu, 4 Nov 2010 20:48:59 +0000 (UTC) Received: by fxm17 with SMTP id 17so2145689fxm.13 for ; Thu, 04 Nov 2010 13:48:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:subject:references :date:message-id:user-agent:mime-version:content-type; bh=Y2DaEvdDNEtRlAmWzUmAmV3tA7qata+69fewCV3dacs=; b=WohiXD81OGrrimpT8yObjUyR1WfM/nhKTqMcsmJFCF/ikviH3aLU1kiXPeGzbDfcFC r5DDo3ZM8pIYoA445NzHWjmQm3V4z39hRnwIfa4nfKdV6sXZv2JwkDqHMr86nPCYsMws XWxXb/ejx3/4K9NBk69DxwsyEfAl8hg8FXf5M= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:subject:references:date:message-id:user-agent:mime-version :content-type; b=sx4ufAByEXyUQ6Lk0h8NPTCm7ps+9StlBrauSL1Q/RYIrMAR2j7ChDXRicy8hC+G51 JOchqR+QXdOoJiS9ZGPMh8AK4Nhcsai8kAqJ/Qm4riT6nkgjekMymup56o5mzaIAuqCL Q/JV7wL5jsj4eJSCSLolf5MNWGd4eRiQmnP+4= Received: by 10.223.69.140 with SMTP id z12mr161206fai.142.1288901942637; Thu, 04 Nov 2010 13:19:02 -0700 (PDT) Received: from localhost ([217.114.211.20]) by mx.google.com with ESMTPS id a25sm234123fab.37.2010.11.04.13.18.58 (version=SSLv3 cipher=RC4-MD5); Thu, 04 Nov 2010 13:19:01 -0700 (PDT) From: Anonymous To: freebsd-gecko@freebsd.org References: <201011022113.oA2LD12f028438@trillian.chruetertee.ch> Date: Thu, 04 Nov 2010 23:18:40 +0300 Message-ID: <86mxposuzj.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain Subject: Re: [SVN-Commit] r430 - in branches/experimental/www/firefox-devel: . files X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Nov 2010 20:49:00 -0000 svn-freebsd-gecko@chruetertee.ch writes: > Author: beat > Date: Tue Nov 2 21:13:01 2010 > New Revision: 430 > > Log: [...] > - Add patches from Firefox 3.6 to fix build with recent gcc versions. It > still does not build with gcc44+. Do you have tinderbox log? Try below diff, it's against snapshot, though. %% Index: Mk/bsd.gecko.mk =================================================================== RCS file: /a/.cvsup/ports/Mk/bsd.gecko.mk,v retrieving revision 1.22 diff -u -p -r1.22 bsd.gecko.mk --- Mk/bsd.gecko.mk 29 Aug 2010 15:16:20 -0000 1.22 +++ Mk/bsd.gecko.mk 26 Oct 2010 09:41:48 -0000 @@ -516,6 +515,7 @@ gecko-post-patch: .for subdir in "" nsprpub js/src @if [ -f ${MOZSRC}/${subdir}/config/system-headers ] ; then \ ${ECHO_CMD} "fenv.h" >> ${MOZSRC}/${subdir}/config/system-headers ; \ + ${ECHO_CMD} "pthread_np.h" >> ${MOZSRC}/${subdir}/config/system-headers ; \ fi .endfor @${REINPLACE_CMD} -e 's|%%MOZILLA%%|${MOZILLA}|g' \ Index: www/firefox-devel/Makefile =================================================================== --- www/firefox-devel/Makefile (revision 430) +++ www/firefox-devel/Makefile (working copy) @@ -61,8 +60,6 @@ WRKSRC:= ${WRKSRC}-central -GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE} - .if ${HAVE_GNOME:Mlibgnomeui}!="" USE_GNOME+= libgnomeui MOZ_OPTIONS+= --enable-gnomeui @@ -109,6 +106,7 @@ post-patch: ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS:C/-pthread/${GECKO_PTHREAD_LIBS}/}|' \ ${WRKSRC}/storage/build/Makefile.in \ + ${WRKSRC}/toolkit/library/Makefile.in \ ${WRKSRC}/db/sqlite3/src/Makefile.in @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ ${WRKSRC}/security/manager/ssl/src/Makefile.in \ Index: www/firefox-devel/files/patch-js-src-jsnativestack.cpp =================================================================== --- www/firefox-devel/files/patch-js-src-jsnativestack.cpp (revision 0) +++ www/firefox-devel/files/patch-js-src-jsnativestack.cpp (revision 0) @@ -0,0 +1,11 @@ +--- js/src/jsnativestack.cpp~ ++++ js/src/jsnativestack.cpp +@@ -50,7 +50,8 @@ + #elif defined(XP_MACOSX) || defined(DARWIN) || defined(XP_UNIX) + # include + + # if defined(__FreeBSD__) ++# include + # include + # endif + Index: www/firefox-devel/files/patch-toolkit_library_Makefile.in =================================================================== --- www/firefox-devel/files/patch-toolkit_library_Makefile.in (revision 430) +++ www/firefox-devel/files/patch-toolkit_library_Makefile.in (working copy) @@ -5,7 +5,7 @@ $(INSTALL) $^ . -EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) -+EXTRA_DSO_LDOPTS += -Wl,--warn-unresolved-symbols -Wl,--as-needed $(LIBS_DIR) $(EXTRA_DSO_LIBS) ++EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) %%PTHREAD_LIBS%% ifdef MOZ_ENABLE_LIBXUL include $(srcdir)/libxul-rules.mk %%