Skip to content

Commit

Permalink
firefox: fixup pre-build
Browse files Browse the repository at this point in the history
- added back disable-gnomevfs
- NEVER exit from module scripts - make them fail instead
- added missing &&
  • Loading branch information
v4hn committed Sep 19, 2014
1 parent ff68b24 commit 6f41496
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 7 deletions.
1 change: 0 additions & 1 deletion web/firefox/BUILD
@@ -1,5 +1,4 @@

#Finally, the build!
if [ "$PGO" == "y" ] ; then
#CCache breaks the pgo build
export CCACHE_DISABLE=1 &&
Expand Down
11 changes: 5 additions & 6 deletions web/firefox/PRE_BUILD
@@ -1,10 +1,10 @@
if [ ! -e /usr/include/cairo/cairo-tee.h ] ; then
message "${PROBLEM_COLOR}Run: ${MODULE_COLOR}lin -c cairo"
message "${MESSAGE_COLOR}To recompile cairo with tee support, which is required by firefox.${DEFAULT_COLOR}"
exit 1
fi
message "${PROBLEM_COLOR}Run: ${MODULE_COLOR}lin -rc cairo" &&
message "${MESSAGE_COLOR}To recompile cairo with tee(libX11) support, which is required by firefox.${DEFAULT_COLOR}" &&
false
fi &&

default_pre_build
default_pre_build &&

# To skirt around this make failure in libxul.so:
# ftbzip2.c:183: undefined reference to `BZ2_bzDecompressInit'
Expand All @@ -29,7 +29,6 @@ cp $SCRIPT_DIRECTORY/mozconfig . &&
export MOZ_OBJDIR="${SOURCE_DIRECTORY}/build-mozilla" &&
mkdir -p ${MOZ_OBJDIR} &&


if module_installed gst-plugins-base-1.0 ; then
echo "ac_add_options --enable-gstreamer=1.0" >> mozconfig
else
Expand Down
1 change: 1 addition & 0 deletions web/firefox/mozconfig
Expand Up @@ -29,6 +29,7 @@ ac_add_options --disable-crashreporter
ac_add_options --disable-necko-wifi
ac_add_options --enable-replace-malloc
ac_add_options --enable-system-cairo
ac_add_options --disable-gnomevfs

# startupcache deterministically segfaults on *some* systems. Just leave it disabled.
ac_add_options --disable-startupcache
Expand Down

0 comments on commit 6f41496

Please sign in to comment.