From 2e2abadf14971ae562e777015752bfe07dcff94a Mon Sep 17 00:00:00 2001
From: Peter Goodman <peter.goodman@gmail.com>
Date: Sun, 29 Nov 2015 14:50:18 -0500
Subject: [PATCH] Trying to correct travis CI issue.

---
 .travis.yml              |   9 +++
 scripts/bootstrap_osx.sh | 135 ---------------------------------------
 2 files changed, 9 insertions(+), 135 deletions(-)
 delete mode 100755 scripts/bootstrap_osx.sh

diff --git a/.travis.yml b/.travis.yml
index b82dcb99..c856cb09 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,15 @@ dist: trusty
 language: cpp
 os: linux
 compiler: clang
+before_install:
+  - sudo apt-get update -qq
+  - sudo apt-get install -y binutils-dev
+  - sudo apt-get install -y build-essential
+  - sudo apt-get install -y gcc
+  - sudo apt-get install -y g++
+  - sudo apt-get install -y cmake
+  - sudo apt-get install -y autotools-dev
+  - sudo apt-get install -y autoconf
 script: "./scripts/bootstrap.sh"
 notifications:
   slack:
diff --git a/scripts/bootstrap_osx.sh b/scripts/bootstrap_osx.sh
deleted file mode 100755
index 76df02f8..00000000
--- a/scripts/bootstrap_osx.sh
+++ /dev/null
@@ -1,135 +0,0 @@
-#!/usr/bin/env bash
-# Copyright 2015 Peter Goodman (peter@trailofbits.com), all rights reserved.
-
-LLVM_VERSION=3.7.0
-PIN_VERSION=2.14-71313-clang.5.1-mac
-
-PIN_URL=http://software.intel.com/sites/landingpage/pintool/downloads/pin-${PIN_VERSION}.tar.gz
-LLVM_URL=http://llvm.org/releases/${LLVM_VERSION}/clang+llvm-${LLVM_VERSION}-x86_64-apple-darwin.tar.xz
-
-# Directory in which the script dir resides (i.e. McSema root dir).
-DIR=$(dirname $( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ))
-
-RED=`tput setaf 1`
-GREEN=`tput setaf 2`
-YELLOW=`tput setaf 3`
-RESET=`tput sgr0`
-
-
-function download_and_install_llvm()
-{
-	echo "${YELLOW}Downloading LLVM and clang ${LLVM_VERSION}.${RESET}"
-
-	# Create third_party directory if it doesn't exist
-	mkdir -p $DIR/third_party
-	pushd $DIR/third_party
-
-	# Download a pre-built clang+llvm to it. OS X doesn't have wget by default. :(
-	curl -O ${LLVM_URL}
-
-	# Extract it to the path expected by compile_semantics.sh
-	mkdir -p $DIR/third_party/llvm/build
-	tar zxf clang+llvm-${LLVM_VERSION}-x86_64-apple-darwin.tar.xz -C llvm/build/ --strip-components=1
-
-	popd
-}
-
-function download_and_install_glog()
-{
-	echo "${YELLOW}Downloading and installing glog.${RESET}"
-
-	pushd $DIR/third_party
-
-	#git clone https://github.com/google/glog.git -t v0.3.4
-	curl -L -O https://github.com/google/glog/archive/v0.3.4.tar.gz
-
-	mkdir -p $DIR/third_party/glog
-	tar zxf v0.3.4.tar.gz -C glog/ --strip-components=1
-
-	popd
-
-	pushd $DIR/third_party/glog
-	./configure --prefix=/usr/local
-	make
-	make install
-	popd
-
-}
-
-function download_and_extract_pin()
-{
-	echo "${YELLOW}Downloading and installing pin.${RESET}"
-
-	pushd $DIR/third_party
-
-	curl -L -O ${PIN_URL}
-
-	mkdir -p $DIR/third_party/pin
-	tar zxf pin-${PIN_VERSION}.tar.gz -C pin/ --strip-components=1
-
-	popd
-}
-
-# Fetch all dependencies.
-echo "${GREEN}Checking dependencies.${RESET}"
-
-# Check for llvm ${LLVM_VERSION}
-if [[ -e $DIR/third_party/llvm/build/bin/clang++ ]]; then
-	echo "${GREEN}LLVM and clang FOUND!${RESET}"
-else
-	download_and_install_llvm
-fi;
-
-if [[ -e /usr/local/include/glog ]]; then
-	echo "${GREEN}glog FOUND!${RESET}"
-else
-	download_and_install_glog
-fi;
-
-
-if [[ -e $DIR/third_party/pin/pin ]]; then
-	echo "${GREEN}pin FOUND!${RESET}"
-else
-	download_and_extract_pin
-fi;
-
-# Create the generated files directories.
-echo "${GREEN}Creating aut-generated files.${RESET}"
-cd $DIR
-mkdir -p $DIR/generated
-mkdir -p $DIR/generated/Arch
-mkdir -p $DIR/generated/CFG
-
-
-# Generate 32- and 64-bit x86 machine state modules for importing by
-# `cfg_to_bc`.
-echo "${YELLOW}Generating architecture-specific state files.${RESET}"
-$DIR/scripts/compile_semantics.sh
-
-
-# Generate the protocol buffer file for the CFG definition. The lifter will
-# read in CFG protobuf files and output LLVM bitcode files.
-echo "${YELLOW}Generating protocol buffers.${RESET}"
-cd $DIR/generated/CFG
-cp $DIR/mcsema/CFG/CFG.proto $DIR/generated/CFG
-protoc --cpp_out=. CFG.proto
-protoc --python_out=. CFG.proto
-
-
-# Build McSema. McSema will be built with the above version of Clang.
-echo "${GREEN}Compiling McSema.${RESET}"
-cd $DIR
-mkdir -p $DIR/build
-cd $DIR/build
-cmake -G "Unix Makefiles" -DMCSEMA_DIR=$DIR -DCMAKE_PREFIX_PATH=$DIR/third_party/llvm/build/share/llvm ..
-make all
-
-
-# Find IDA.
-
-#echo "${GREEN}Finding IDA.${RESET}"
-#IDA=`locate idal64 | head -n 1`
-#if [ ! -e $IDA ] ; then
-#    echo "${RED}Error: Could not find IDA."
-#fi
-