Merge pull request Komodo#2 from Laniture/2

2

README.md

@@ -16,7 +16,8 @@ the entire project.
 - [Feedback](#feedback)
 - [Building Komodo](#building-komodo)
  - [Building on Windows](#building-on-windows)
- - [Building on Mac & Linux](#building-on-mac-and-linux)
+ - [Building on Mac](#building-on-mac)
+ - [building on Linux](#building-on-linux)
  - [Building with Docker](#building-with-docker)
  - [Building Complications](#building-complications)
 
@@ -43,9 +44,8 @@ IRC: <irc://irc.mozilla.org/#komodo>
 Mailing Lists: [komodo-discuss](http://code.activestate.com/lists/komodo-discuss/) & [komodo-beta](http://code.activestate.com/lists/komodo-beta/) & [komodo-announce](http://code.activestate.com/lists/komodo-announce/)
 
 ## Building Komodo
-
 Note that these are simplified steps of the building process, for a more in-depth
-guide check [BUILD.txt](BUILD.txt).
+guide check (outdated) [BUILD.txt](docs/BUILD.txt). 
 
 ### Building on Windows
 
@@ -108,13 +108,9 @@ Upon making any modifications to the source you will again have to run `bk build
 or simply `bk build && bk run` to quickly get back into Komodo. Subsequent builds
 should be a lot faster as much of the compiled data is cached.
 
-### Building on Mac and Linux
+### Building on Mac
 
 - [Mac Prerequisites](#mac-prerequisites)
-- [Linux Prerequisites](#linux-prerequisites)
- - [Ubuntu](#ubuntu)
- - [Fedora](#fedora)
- - [Others](#others)
 - [Building Steps](#building-steps-1)
 
 #### Mac Prerequisites
@@ -160,27 +156,6 @@ under Xcode 8 using a new extra steps.
  * Ensure you are using ccache 3.1 (later versions will break)
  * Configure Mozilla with `--options=disable-webrtc`
 
-#### Linux Prerequisites
-
- * Subversion if it's not already installed. Installing from package installers such as apt-get on Ubuntu or yum on Redhat/Fedora is ok.
-
-##### Ubuntu
-
- `sudo apt-get build-dep firefox`
-
-##### Fedora
-
- `sudo yum install gcc-c++ patch gtk2-devel libIDL-devel libcurl-devel`
-
-##### Others
-
- * Python >=2.7 (but not Python 3.x yet). You can
- [install ActivePython from here](http://downloads.activestate.com/ActivePython/releases).
-
- If you prefer, your distro's Python 2.7 should be sufficient.
-
- * Everything mentioned in the
- [Mozilla Linux build prerequisites](http://developer.mozilla.org/en/docs/Linux_Build_Prerequisites): 
 
 #### Building Steps
 
@@ -270,6 +245,12 @@ Upon making any modifications to the source you will again have to run `bk build
 or simply `bk build && bk run` to quickly get back into Komodo. Subsequent builds
 should be a lot faster as much of the compiled data is cached.
 
+### Building on Linux
+[Linux instructions](docs/Linux_build_guide.md)
+<br />
+<br />
+
+
 ### Building with Docker
 
 The easiest way to get started is to use our Docker image, this will basically

BUILD.txt → docs/BUILD.txt

@@ -233,6 +233,61 @@ for Komodo, you should only need to do this once (in a while).
 
 
 
+
+
+
+
+##### ** Building with GCC 5.0 and higher **
+ If you are using GCC 5.0, the build may fail. If it does,
+ there are changes that need to be made to two files. However, if you are running
+ a clean build for the first time, you need to allow this part of the build to fail
+ first. This is because the files are in the Mozilla part of the build which has to
+ be downloaded first.
+
+###### These files need to be changed:
+ 1) /KomodoEdit/mozilla/build/moz3500-ko9.10/mozilla/configure.in
+
+ ```
+ @@ -7509,8 +7509,6 @@
+ eval $(CXX="$CXX" HOST_CXX="$HOST_CXX" $PYTHON -m mozbuild.configure.libstdcxx)
+ AC_SUBST(MOZ_LIBSTDCXX_TARGET_VERSION)
+ AC_SUBST(MOZ_LIBSTDCXX_HOST_VERSION)
++ CXXFLAGS="$CXXFLAGS -D_GLIBCXX_USE_CXX11_ABI=0"
++ HOST_CXXFLAGS="$HOST_CXXFLAGS -D_GLIBCXX_USE_CXX11_ABI=0"
+ fi
+ ```
+
+ See [bug #1153109](https://bugzilla.mozilla.org/show_bug.cgi?id=1153109) in Mozilla's bug database for more information.
+
+ 2) /KomodoEdit/mozilla/build/moz3500-ko9.10/mozilla/dom/ipc/Blob.cpp
+
+ ```
+ @@ -3874,7 +3874,7 @@
+ // Make sure we can't overflow.
+ if (NS_WARN_IF(UINT64_MAX - aLength < aStart)) {
+ ASSERT_UNLESS_FUZZING();
+- return nullptr;
++ return false;
+ }
+
+ ErrorResult errorResult;
+ @@ -3883,7 +3883,7 @@
+
+ if (NS_WARN_IF(aStart + aLength > blobLength)) {
+ ASSERT_UNLESS_FUZZING();
+- return nullptr;
++ return false;
+ }
+ ```
+
+ See [Porting to GCC 5](https://gcc.gnu.org/gcc-5/porting_to.html) for more information.
+
+
+
+
+
+
+
 Step 3: Building Komodo
 -----------------------