Date: Thu, 22 Dec 2011 00:04:46 +0100 From: Florian Smeets <flo@FreeBSD.org> To: Piotr Kubaj <pkubaj@gmail.com>, az@azsupport.com Cc: freebsd-gecko@FreeBSD.org, Beat Gaetzi <beat@FreeBSD.org> Subject: Re: FreeBSD Port: www/firefox Message-ID: <4EF2660E.8040605@FreeBSD.org> In-Reply-To: <4EF2626E.3090606@FreeBSD.org> References: <CABsLMBTjccNxxb29DLVTn318afgOtJ6bum_7BzA2-NEeZeS-JA@mail.gmail.com> <CAJTLrNwrk0RYStYn19yLcLBw7me3EiFkyMD7DXTA0wXNi73YUA@mail.gmail.com> <4EF2626E.3090606@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 2440 and 3156)
--------------enig2DCBBFF6F0E640359BA4BA7C
Content-Type: multipart/mixed; boundary="------------070209000203050605020307"
This is a multi-part message in MIME format.
--------------070209000203050605020307
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable
On 21.12.11 23:49, Florian Smeets wrote:
> On 21.12.11 17:21, Beat Gaetzi wrote:
>> 2011/12/21 Piotr Kubaj <pkubaj@gmail.com>:
>>> 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 amd6=
4
>>
>> 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.
>>
>=20
> The following patch should fix it. Could you please confirm?
>=20
The final patch should of course look like this...
Florian
--------------070209000203050605020307
Content-Type: text/plain; x-mac-type="0"; x-mac-creator="0";
name="ff9-pgo.diff"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
filename="ff9-pgo.diff"
Index: Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
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/ns=
prpub) \
+ $(OS_INCLUDES) \
+ $(NULL)=20
Index: files/patch-config_mkdepend_Makefile.in
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
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 @@
+=20
include $(topsrcdir)/config/rules.mk
=20
- HOST_CFLAGS +=3D -DINCLUDEDIR=3D\"/usr/include\" -DOBJSUFFIX=3D\".$(OBJ=
_SUFFIX)\"
+-HOST_CFLAGS +=3D -DINCLUDEDIR=3D\"/usr/include\" -DOBJSUFFIX=3D\".$(OBJ=
_SUFFIX)\"
++HOST_CFLAGS +=3D -DINCLUDEDIR=3D\"%%LOCALBASE%%/include\" -DOBJSUFFIX=3D=
\".$(OBJ_SUFFIX)\" -I%%LOCALBASE%%/include
+HOST_CFLAGS +=3D $(XCFLAGS)
=20
ifdef GNU_CC
Index: files/patch-js-src-config-mkdepend_Makefile.in
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/flo/dev/cvs/ports/www/firefox/files/patch-js-src-config-m=
kdepend_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 -0=
000 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.06907474=
8 +0000
-+++ js/src/config/mkdepend/Makefile.in 2009-04-28 08:18:44.897081100 +00=
00
-@@ -72,7 +72,7 @@
+--- js/src/config/mkdepend/Makefile.in.orig 2011-12-16 21:29:22.00000000=
0 +0100
++++ js/src/config/mkdepend/Makefile.in 2011-12-21 23:02:17.000000000 +01=
00
+@@ -71,7 +71,8 @@
=20
include $(topsrcdir)/config/rules.mk
=20
-HOST_CFLAGS +=3D -DINCLUDEDIR=3D\"/usr/include\" -DOBJSUFFIX=3D\".$(OBJ=
_SUFFIX)\"
-+HOST_CFLAGS +=3D -DINCLUDEDIR=3D\"%%LOCALBASE%%/include\" -DOBJSUFFIX=3D=
\".$(OBJ_SUFFIX)\" -I/usr/local/include
++HOST_CFLAGS +=3D -DINCLUDEDIR=3D\"%%LOCALBASE%%/include\" -DOBJSUFFIX=3D=
\".$(OBJ_SUFFIX)\" -I%%LOCALBASE%%/include
++HOST_CFLAGS +=3D $(XCFLAGS)
=20
ifdef GNU_CC
_GCCDIR =3D $(shell $(CC) -print-file-name=3Dinclude)
--------------070209000203050605020307--
--------------enig2DCBBFF6F0E640359BA4BA7C
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: OpenPGP digital signature
Content-Disposition: attachment; filename="signature.asc"
-----BEGIN PGP SIGNATURE-----
iEYEARECAAYFAk7yZg4ACgkQapo8P8lCvwkhvACePiTkXiAT4F57FfEdJfjUS/WU
BTIAn3IghnIjiUs1HAFeJ/k7MoHRKCUu
=mFBZ
-----END PGP SIGNATURE-----
--------------enig2DCBBFF6F0E640359BA4BA7C--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4EF2660E.8040605>