Merge pull request elastic#468 from kjell-hedstrom/gcc_5x

Gcc 5x

.gitignore

@@ -3,8 +3,7 @@ cpp
 java
 php
 thirdParty/dist
-thirdParty/protobuf-2.4.1/
-thirdParty/protobuf-2.5.0/
+thirdParty/protobuf-*/
 thirdParty/github.com
 source
 .idea/

scripts/buildProtoFiles.sh

@@ -10,11 +10,17 @@ thirdPartyDir="$startDir"/thirdParty
 DIST=dist
 DISTDIR="$thirdPartyDir"/$DIST
 protoInstallDir="$DISTDIR"/protobuf/
-protoc="$protoInstallDir"/bin/protoc
+protoc="/usr/local/probe/bin/protoc"
 phpprotoc="/usr/local/probe/bin/protoc-gen-php"
-PROTOBUFFER_VERSION=2.5.0
+PROTOBUFFER_VERSION=2.6.1
 GLOBAL_CPP_FLAGS="-fPIC"
 
+if [ ! -d "$startDir/thirdParty/dist/protobuf/include" ]; then
+  # skip a bunch of warnings. just create this directory if it doesn't already exist
+  # even if it is not always used
+  mkdir -p "$startDir/thirdParty/dist/protobuf/include"
+fi
+
 gogoBaseDir="$thirdPartyDir"/github.com/gogo/
 if [ ! -d "$gogoBaseDir/protobuf" ]; then
   mkdir -p "$gogoBaseDir"

scripts/buildProtoFilesJava.sh

@@ -9,7 +9,7 @@ DIST=dist
 DISTDIR="$thirdPartyDir"/$DIST
 protoInstallDir="$DISTDIR"/protobuf/
 protoc="$protoInstallDir"/bin/protoc
-PROTOBUFFER_VERSION=2.5.0
+PROTOBUFFER_VERSION=2.6.1
 GLOBAL_CPP_FLAGS="-fPIC"
 
 if [ ! -f "$protoc" ]; then

scripts/buildProtoFilesPython.sh

@@ -8,7 +8,7 @@ DIST=dist
 DISTDIR="$thirdPartyDir"/$DIST
 protoInstallDir="$DISTDIR"/protobuf/
 protoc="$protoInstallDir"/bin/protoc
-PROTOBUFFER_VERSION=2.5.0
+PROTOBUFFER_VERSION=2.6.1
 GLOBAL_CPP_FLAGS="-fPIC"
 
 if [ ! -f "$protoc" ]; then

scripts/compileThirdParty.sh

@@ -6,14 +6,14 @@ DIST=dist
 DISTDIR="$thirdPartyDir"/$DIST
 protoInstallDir="$DISTDIR"/protobuf/
 protoc="$protoInstallDir"/bin/protoc
-PROTOBUFFER_VERSION=2.5.0
-GLOBAL_CPP_FLAGS="-fPIC -L/usr/local/probe/lib -L/usr/local/probe/lib64 -Wl,-rpath -Wl,/usr/local/probe/lib64 -Wl,-rpath -Wl,/usr/local/probe/lib -Ofast -m64 -flto"
+PROTOBUFFER_VERSION=2.6.1
+GLOBAL_CPP_FLAGS="-fPIC -Ofast -m64 -flto "
 PATH=/usr/local/probe/bin:$PATH
 
 rm -rf "$DISTDIR"/protobuf
 rm -rf "$thirdPartyDir"/protobuf-$PROTOBUFFER_VERSION
 cd "$thirdPartyDir"
-tar xvjf protobuf-$PROTOBUFFER_VERSION.tar.bz2
+tar xvzf protobuf-$PROTOBUFFER_VERSION.tar.gz
 cd protobuf-$PROTOBUFFER_VERSION
 CPPFLAGS="$CPPFLAGS $GLOBAL_CPP_FLAGS" LDFLAGS=$GLOBAL_CPP_FLAGS ./configure --prefix="$DISTDIR"/protobuf
 make -j