On Mon, 26 Nov 2012, [email protected] wrote:
Author: jbeich
Date: Mon Nov 26 05:13:11 2012
New Revision: 1104
Log:
one more ugly workaround for gcc42
Added:
trunk/www/firefox-nightly/files/patch-bug815025
trunk/www/firefox/files/patch-bug815025
Added: trunk/www/firefox-nightly/files/patch-bug815025
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/firefox-nightly/files/patch-bug815025 Mon Nov 26 05:13:11
2012 (r1104)
@@ -0,0 +1,27 @@
+--- mfbt/SHA1.h~
++++ mfbt/SHA1.h
+@@ -13,6 +13,11 @@
+
+ #include <stddef.h>
+
++#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 3
++/* c++/36107: mark SHA1Sum constructor as weak manually */
++__asm__(".weak _ZN7mozilla7SHA1SumC1Ev");
++#endif
++
+ namespace mozilla {
+
+ /**
+@@ -44,7 +49,12 @@ class SHA1Sum
+ bool mDone;
+
+ public:
++#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 3
++ /* c++/36107: gcc42 fails to remove *INTERNAL* from produced asm */
++ MOZ_IMPORT_API SHA1Sum();
++#else
+ MFBT_API SHA1Sum();
++#endif
+
+ static const size_t HashSize = 20;
+ typedef uint8_t Hash[HashSize];
Added: trunk/www/firefox/files/patch-bug815025
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/firefox/files/patch-bug815025 Mon Nov 26 05:13:11 2012
(r1104)
@@ -0,0 +1,27 @@
+--- mfbt/SHA1.h~
++++ mfbt/SHA1.h
+@@ -27,6 +27,11 @@
+ #include "mozilla/StandardInteger.h"
+ #include "mozilla/Types.h"
+
++#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 3
++/* c++/36107: mark SHA1Sum constructor as weak manually */
++__asm__(".weak _ZN7mozilla7SHA1SumC1Ev");
++#endif
++
+ namespace mozilla {
+ class SHA1Sum {
+ union {
+@@ -39,7 +43,12 @@ class SHA1Sum {
+
+ public:
+ static const unsigned int HashSize = 20;
++#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 3
++ /* c++/36107: gcc42 fails to remove *INTERNAL* from produced asm */
++ MOZ_IMPORT_API() SHA1Sum();
++#else
+ MFBT_API() SHA1Sum();
++#endif
+ MFBT_API(void) update(const void* dataIn, uint32_t len);
+ MFBT_API(void) finish(uint8_t hashout[20]);
+ };
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-gecko
To unsubscribe, send any mail to "[email protected]"
FreeBSD FBSD10 10.0-CURRENT FreeBSD 10.0-CURRENT #45 r243567: Mon Nov 26
14:38:46 EST 2012 root@FBSD10:/usr/obj/usr/src/sys/MYKERNEL amd64
# svn up
Updating '.':
At revision 1104.
[root@FBSD10 /home/root/ff_nightly]# make update && make makesum && time
make all deinstall install clean
===> Found saved configuration for firefox-nightly-19.0.112468,1
=> 597915b66059.tar.bz2 doesn't seem to exist in
/usr/ports/distfiles/firefox-nightly.
=> Attempting to fetch
http://hg.mozilla.org/mozilla-central/archive/597915b66059.tar.bz2
fetch: http://hg.mozilla.org/mozilla-central/archive/597915b66059.tar.bz2:
size of remote file is not known
597915b66059.tar.bz2 92 MB 590 kBps
02m40s
===> firefox-nightly-20.0.114111,1 depends on package: nspr>=4.9.4 - not
found
pkg_info: You appear to be using the newer pkg(1) tool on this system for
package management, rather than the legacy package management tools
(pkg_*). The legacy tools should no longer be used on this system.
===> Found nspr-4.9.3, but you need to upgrade to nspr>=4.9.4.
*** [build-depends] Error code 1
Stop in /home/root/ff_nightly.
*** [/home/root/ff_nightly/work/.configure_done.firefox._usr_local] Error
code 1
I have the following in make.conf:
# cat /etc/make.conf
OVERRIDE_LINUX_BASE_PORT=f10
QT4_OPTIONS= QGTKSTYLE
WITHOUT_PKGNG=yes
MALLOC_PRODUCTION=yes
I am concerned about the following "You appear to be using the newer
pkg(1) tool on this system for
package management, rather than the legacy package management tools
(pkg_*). The legacy tools should no longer be used on this system."
I build all ports locally, I never switched to pkgng. Is this a mistake?
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-gecko
To unsubscribe, send any mail to "[email protected]"
