From bbe925bf77a45fcbaa5fd9d725dc52b2aa6b23e6 Mon Sep 17 00:00:00 2001
From: Anthony Lichnewsky <alichnewsky@slb.com>
Date: Mon, 5 Sep 2016 03:24:44 +0000
Subject: [PATCH] fixes for debian and clang 3.9 or 4.0?

---
 build_crosstool.sh                  | 18 ++++++++++++------
 crosstool/crosstool-grte-clang.spec |  1 +
 release.py                          |  2 +-
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/build_crosstool.sh b/build_crosstool.sh
index 8089182..d64966f 100755
--- a/build_crosstool.sh
+++ b/build_crosstool.sh
@@ -37,13 +37,13 @@ CROSSTOOL_GCC_VERSION="4.9"
 
 # Assume the clang source code is checked out following
 # http://clang.llvm.org/get_started.html
-CROSSTOOL_CLANG_VERSION="3.7"
+CROSSTOOL_CLANG_VERSION="3.9"
 
 : ${crosstool_rpmver:="1.0"}
 # Update this each time new RPM's are built.
 : ${crosstool_rpmrel:="8"}
 
-export PARALLELMFLAGS="${JFLAGS:-j8}"
+export PARALLELMFLAGS="${JFLAGS:-j32}"
 [ -z "${EMAIL}" ] && {
     EMAIL="foo@bar.io"
     export EMAIL
@@ -58,12 +58,18 @@ done
 ln -sf /bin/bash /bin/sh
 
 # install packages that are needed by building binutils and clang
-apt-get update
-apt-get install -y flex bison rpm texinfo texi2html libxml2-dev make alien
+apt-get update --fix-missing
+apt-get install -y flex bison rpm texinfo texi2html libxml2-dev make alien wget python
 
 function build_rpm() {
     local rpmrel=$1
     local spec_file=$2
+
+    # avoid issues in rpmbuild within docker.
+    # rpmbuild is evoked by the default user account (root)
+    # when the files are mounted with a volume and do not have root permissions.
+    chown root:root /sources/*.tar.*
+    
     rpmbuild \
         --dbpath /dev/null \
         --define "_hash_empty_files 1" \
@@ -120,10 +126,10 @@ dpkg -i ${DEB_DIR}/${GRTEBASENAME}-crosstool${CROSSTOOL_VERSION}-gcc-${CROSSTOOL
 
 # Build cmake because cmake in ubuntu 13 is too old
 mkdir -p ${STAGING}/cmake
-CMAKE_VERSION=3.3.2
+CMAKE_VERSION=3.6.1
 if [ ! -e ${CROSSTOOL_SOURCES}/cmake-${CMAKE_VERSION}.tar.gz ]; then
     pushd ${CROSSTOOL_SOURCES}
-    wget http://cmake.org/files/v3.3/cmake-${CMAKE_VERSION}.tar.gz
+    wget http://cmake.org/files/v3.6/cmake-${CMAKE_VERSION}.tar.gz
     popd
 fi
 tar zxf ${CROSSTOOL_SOURCES}/cmake-${CMAKE_VERSION}.tar.gz -C ${STAGING}/cmake
diff --git a/crosstool/crosstool-grte-clang.spec b/crosstool/crosstool-grte-clang.spec
index 73a559b..f7c2ee2 100644
--- a/crosstool/crosstool-grte-clang.spec
+++ b/crosstool/crosstool-grte-clang.spec
@@ -85,6 +85,7 @@ export PATH="%{grte_top}/bin:%{grte_top}/sbin:$PATH"
 %{target_top}/x86/include/*
 %{target_top}/x86/lib/*
 %{target_top}/x86/share/*
+%{target_top}/x86/libexec/*
 
 %changelog
 * Mon Jun 01 2015 Release Engineer <%{maintainer_email}>
diff --git a/release.py b/release.py
index 3794244..2f6fbee 100755
--- a/release.py
+++ b/release.py
@@ -127,7 +127,7 @@ def main():
     mounts.append((os.path.abspath(args.upstream_source), sources_dir))
 
     env = {
-        'JFLAGS' : '-j8',
+        'JFLAGS' : '-j32',
         'GRTE_PACKAGE_PREFIX' : args.lrte_package_prefix,
     }
     if args.email: