On 21.12.11 23:49, Florian Smeets wrote: > On 21.12.11 17:21, Beat Gaetzi wrote: >> 2011/12/21 Piotr Kubaj <[email protected]>: >>> I get the same error, the enabled options are dbus, pgo and >>> optimized_cflags. I build with access to X. My uname -a is: >>> FreeBSD beastie 9.0-PRERELEASE FreeBSD 9.0-PRERELEASE #15: Thu Dec 1 >>> 22:33:44 CET 2011 root@beastie:/usr/obj/usr/src/sys/BEASTIE amd64 >> >> Yes, there is currently a problem with the PGO option. We are >> working on a fix. In the meantime you could build Firefox >> without PGO. >> > > The following patch should fix it. Could you please confirm? >
The final patch should of course look like this... Florian
Index: Makefile
===================================================================
RCS file: /home/flo/dev/cvs/ports/www/firefox/Makefile,v
retrieving revision 1.257
diff -u -r1.257 Makefile
--- Makefile 21 Dec 2011 08:02:57 -0000 1.257
+++ Makefile 21 Dec 2011 22:56:07 -0000
@@ -118,6 +118,8 @@
${WRKSRC}/security/manager/ssl/src/Makefile.in \
${WRKSRC}/js/src/config/mkdepend/Makefile.in \
${WRKSRC}/js/src/config/config.mk \
+ ${WRKSRC}/config/mkdepend/Makefile.in \
+ ${WRKSRC}/config/config.mk \
${WRKSRC}/xpcom/io/nsAppFileLocationProvider.cpp
@${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \
s|-lpthread|${PTHREAD_LIBS}|g ; \
Index: files/patch-config_config.mk
===================================================================
RCS file: files/patch-config_config.mk
diff -N files/patch-config_config.mk
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-config_config.mk 21 Dec 2011 22:56:07 -0000
@@ -0,0 +1,10 @@
+--- config/config.mk.orig 2009-08-07 00:49:23.000000000 +0200
++++ config/config.mk 2009-08-09 20:50:05.000000000 +0200
+@@ -506,6 +506,7 @@
+ -I$(srcdir) \
+ -I. \
+ -I$(DIST)/include -I$(DIST)/include/nsprpub \
++ -I%%LOCALBASE%%/include \
+ $(if $(LIBXUL_SDK),-I$(LIBXUL_SDK)/include -I$(LIBXUL_SDK)/include/nsprpub)
\
+ $(OS_INCLUDES) \
+ $(NULL)
Index: files/patch-config_mkdepend_Makefile.in
===================================================================
RCS file:
/home/flo/dev/cvs/ports/www/firefox/files/patch-config_mkdepend_Makefile.in,v
retrieving revision 1.2
diff -u -r1.2 patch-config_mkdepend_Makefile.in
--- files/patch-config_mkdepend_Makefile.in 7 Feb 2010 21:48:43 -0000
1.2
+++ files/patch-config_mkdepend_Makefile.in 21 Dec 2011 22:56:07 -0000
@@ -1,9 +1,11 @@
---- config/mkdepend/Makefile.in.orig 2009-04-28 08:07:48.532396203 +0000
-+++ config/mkdepend/Makefile.in 2009-04-28 08:08:07.342398592 +0000
-@@ -73,6 +73,7 @@
+--- config/mkdepend/Makefile.in.orig 2011-12-16 21:29:22.000000000 +0100
++++ config/mkdepend/Makefile.in 2011-12-21 23:02:17.000000000 +0100
+@@ -71,7 +71,8 @@
+
include $(topsrcdir)/config/rules.mk
- HOST_CFLAGS += -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\"
+-HOST_CFLAGS += -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\"
++HOST_CFLAGS += -DINCLUDEDIR=\"%%LOCALBASE%%/include\"
-DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -I%%LOCALBASE%%/include
+HOST_CFLAGS += $(XCFLAGS)
ifdef GNU_CC
Index: files/patch-js-src-config-mkdepend_Makefile.in
===================================================================
RCS file:
/home/flo/dev/cvs/ports/www/firefox/files/patch-js-src-config-mkdepend_Makefile.in,v
retrieving revision 1.1
diff -u -r1.1 patch-js-src-config-mkdepend_Makefile.in
--- files/patch-js-src-config-mkdepend_Makefile.in 7 Feb 2010 21:48:44
-0000 1.1
+++ files/patch-js-src-config-mkdepend_Makefile.in 21 Dec 2011 22:56:09
-0000
@@ -1,11 +1,12 @@
---- js/src/config/mkdepend/Makefile.in.orig 2009-04-28 08:17:55.069074748
+0000
-+++ js/src/config/mkdepend/Makefile.in 2009-04-28 08:18:44.897081100 +0000
-@@ -72,7 +72,7 @@
+--- js/src/config/mkdepend/Makefile.in.orig 2011-12-16 21:29:22.000000000
+0100
++++ js/src/config/mkdepend/Makefile.in 2011-12-21 23:02:17.000000000 +0100
+@@ -71,7 +71,8 @@
include $(topsrcdir)/config/rules.mk
-HOST_CFLAGS += -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\"
-+HOST_CFLAGS += -DINCLUDEDIR=\"%%LOCALBASE%%/include\"
-DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -I/usr/local/include
++HOST_CFLAGS += -DINCLUDEDIR=\"%%LOCALBASE%%/include\"
-DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -I%%LOCALBASE%%/include
++HOST_CFLAGS += $(XCFLAGS)
ifdef GNU_CC
_GCCDIR = $(shell $(CC) -print-file-name=include)
signature.asc
Description: OpenPGP digital signature
