diff options
| author | Alan Eldridge <alane@FreeBSD.org> | 2002-12-14 22:49:59 +0000 |
|---|---|---|
| committer | Alan Eldridge <alane@FreeBSD.org> | 2002-12-14 22:49:59 +0000 |
| commit | ce7094e45190dd4f0198f72159b2569db592e230 (patch) | |
| tree | d2ce0e9d6c7b33b2d705a0abc199ec7e4faa0e28 /www/firefox36/files | |
| parent | Fix build by USE_LINUX=yes instead of explicit (bogus) dependency (diff) | |
The problem wasn't the patch, it was third party font ports. The patch has
been restored, extra knobs have added, and extensive diagnostics have been
added. PLEASE upgrade to this version.
Approved by: kris (part of phoenix upgrade)
Notes
Notes:
svn path=/head/; revision=71643
Diffstat (limited to 'www/firefox36/files')
| -rw-r--r-- | www/firefox36/files/mozconfig.in | 18 | ||||
| -rw-r--r-- | www/firefox36/files/patch-nsprpub-pr-src-pthreads-ptio.c | 22 |
2 files changed, 36 insertions, 4 deletions
diff --git a/www/firefox36/files/mozconfig.in b/www/firefox36/files/mozconfig.in index 2bea08b6719a..50703b5df336 100644 --- a/www/firefox36/files/mozconfig.in +++ b/www/firefox36/files/mozconfig.in @@ -33,13 +33,12 @@ ac_add_options --with-system-zlib ac_add_options --with-system-png=@LOCALBASE@ ac_add_options --with-system-mng=@LOCALBASE@ ###################################################################### -# enable features +# set compile/link features ac_add_options --with-pthreads -ac_add_options --enable-xft ac_add_options --enable-reorder ac_add_options --enable-strip ###################################################################### -# disable unneeded to speed up and/or save space +# disable unneeded/unavailable ac_add_options --disable-auto-deps ac_add_options --disable-bidi ac_add_options --disable-dtd-debug @@ -47,10 +46,21 @@ ac_add_options --disable-jsd ac_add_options --disable-ldap ac_add_options --disable-pedantic ac_add_options --disable-xinerama +###################################################################### +# conditional from port Makefile if test -n "$WITH_DEBUG"; then ac_add_options --enable-debug +else + ac_add_options --disable-debug +fi # test -n "$WITH_DEBUG" +if test -n "$WITH_LOGGING"; then ac_add_options --enable-logging else ac_add_options --disable-logging -fi # test -n "$WITH_DEBUG" +fi # test -n "$WITH_LOGGING" +if test -z "$WITHOUT_XFT"; then + ac_add_options --enable-xft +else + ac_add_options --disable-xft +fi # test -z "$WITHOUT_XFT" ###################################################################### diff --git a/www/firefox36/files/patch-nsprpub-pr-src-pthreads-ptio.c b/www/firefox36/files/patch-nsprpub-pr-src-pthreads-ptio.c new file mode 100644 index 000000000000..4a965d4c7440 --- /dev/null +++ b/www/firefox36/files/patch-nsprpub-pr-src-pthreads-ptio.c @@ -0,0 +1,22 @@ +Index: nsprpub/pr/src/pthreads/ptio.c +diff -u nsprpub/pr/src/pthreads/ptio.c.orig nsprpub/pr/src/pthreads/ptio.c +--- nsprpub/pr/src/pthreads/ptio.c.orig Fri Apr 12 03:14:39 2002 ++++ nsprpub/pr/src/pthreads/ptio.c Tue Jul 30 18:52:11 2002 +@@ -3414,6 +3414,17 @@ + if (osfd == -1) pt_MapError(_PR_MD_MAP_SOCKET_ERROR, errno); + else + { ++#if (defined(_PR_INET6_PROBE) || defined(_PR_INET6)) && \ ++ defined(__FreeBSD__) && defined(IPV6_V6ONLY) ++ if (domain == PR_AF_INET6) { ++ int opt = 0; ++ if (setsockopt(osfd, IPPROTO_IPV6, IPV6_V6ONLY, ++ &opt, sizeof(opt))) { ++ close(osfd); ++ return NULL; ++ } ++ } ++#endif + fd = pt_SetMethods(osfd, ftype, PR_FALSE, PR_FALSE); + if (fd == NULL) close(osfd); + } |