Merge commit 'f8dd96543542220181c76afb8c084f4908213fb5' as 'third_party/mason'

This commit is contained in:
Patrick Niklaus
2016-12-15 10:31:15 +00:00
796 changed files with 30230 additions and 0 deletions
+18
View File
@@ -0,0 +1,18 @@
language: generic
matrix:
include:
- os: osx
osx_image: xcode8
compiler: clang
- os: linux
compiler: clang
sudo: false
addons:
apt:
sources: [ 'ubuntu-toolchain-r-test' ]
packages: [ 'libstdc++-5-dev' ]
script:
- ./mason build ${MASON_NAME} ${MASON_VERSION}
- ./mason publish ${MASON_NAME} ${MASON_VERSION}
+30
View File
@@ -0,0 +1,30 @@
diff --git a/build/linux.gcc.inc b/build/linux.gcc.inc
index b4faddc..7668a57 100644
--- a/build/linux.gcc.inc
+++ b/build/linux.gcc.inc
@@ -40,8 +40,8 @@ DYLIB_KEY = -shared
EXPORT_KEY = -Wl,--version-script,
LIBDL = -ldl
-CPLUS = g++
-CONLY = gcc
+CPLUS = $(CXX)
+CONLY = $(CC)
LIB_LINK_FLAGS = $(DYLIB_KEY) -Wl,-soname=$(BUILDING_LIBRARY)
LIBS += -lpthread -lrt
LINK_FLAGS = -Wl,-rpath-link=. -rdynamic
diff --git a/build/macos.clang.inc b/build/macos.clang.inc
index ca28be7..355d418 100644
--- a/build/macos.clang.inc
+++ b/build/macos.clang.inc
@@ -24,8 +24,8 @@
# invalidate any other reasons why the executable file might be covered by
# the GNU General Public License.
-CPLUS = clang++
-CONLY = clang
+CPLUS = $(CXX)
+CONLY = $(CC)
COMPILE_ONLY = -c -MMD
PREPROC_ONLY = -E -x c++
INCLUDE_KEY = -I
+87
View File
@@ -0,0 +1,87 @@
#!/usr/bin/env bash
MASON_NAME=tbb
MASON_VERSION=43_20150316
MASON_LIB_FILE=lib/libtbb.${MASON_DYNLIB_SUFFIX}
. ${MASON_DIR}/mason.sh
function mason_load_source {
mason_download \
https://www.threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb${MASON_VERSION}oss_src.tgz \
4dabc26bb82aa35b6ef6b30ea57fe6e89f55a485
mason_extract_tar_gz
export MASON_BUILD_PATH=${MASON_ROOT}/.build/${MASON_NAME}${MASON_VERSION}oss
}
function create_links() {
libname=$1
if [ -f ${MASON_PREFIX}/lib/${libname}.so ]; then rm ${MASON_PREFIX}/lib/${libname}.so; fi
cp $(pwd)/build/BUILDPREFIX_release/${libname}.so.2 ${MASON_PREFIX}/lib/
(cd ${MASON_PREFIX}/lib/ && ln -s ${libname}.so.2 ${libname}.so)
}
function mason_compile {
mason_step "Loading patch 'https://github.com/mapbox/mason/blob/${MASON_SLUG}/patch.diff'..."
curl --retry 3 -s -f -# -L \
https://raw.githubusercontent.com/mapbox/mason/${MASON_SLUG}/patch.diff \
-O || (mason_error "Could not find patch for ${MASON_SLUG}" && exit 1)
patch -N -p1 < ./patch.diff
CXXFLAGS="${CXXFLAGS} -Wno-attributes"
# libtbb does not support -fvisibility=hidden
CXXFLAGS="${CXXFLAGS//-fvisibility=hidden}"
#patch -N -p1 < ${PATCHES}/tbb_compiler_override.diff || true
# note: static linking not allowed: http://www.threadingbuildingblocks.org/faq/11
if [[ $(uname -s) == 'Darwin' ]]; then
make -j${MASON_CONCURRENCY} tbb_build_prefix=BUILDPREFIX arch=intel64 cpp0x=1 stdlib=libc++ compiler=clang tbb_build_dir=$(pwd)/build
else
LDFLAGS="${LDFLAGS} "'-Wl,-z,origin -Wl,-rpath=\$$ORIGIN'
make -j${MASON_CONCURRENCY} tbb_build_prefix=BUILDPREFIX cfg=release arch=intel64 cpp0x=1 tbb_build_dir=$(pwd)/build
fi
# custom install
mkdir -p ${MASON_PREFIX}/lib/
mkdir -p ${MASON_PREFIX}/include/
mkdir -p ${MASON_PREFIX}/bin/
if [[ $(uname -s) == "Darwin" ]]; then
cp $(pwd)/build/BUILDPREFIX_release/lib*.* ${MASON_PREFIX}/lib/
# add rpath so that apps building against this lib can embed location to this lib
# by passing '-rpath ${MASON_PREFIX}/lib/'
# https://wincent.com/wiki/@executable_path,_@load_path_and_@rpath
install_name_tool -id @rpath/libtbb.dylib ${MASON_PREFIX}/lib/libtbb.dylib
install_name_tool -id @rpath/libtbbmalloc.dylib ${MASON_PREFIX}/lib/libtbbmalloc.dylib
install_name_tool -id @rpath/libtbbmalloc_proxy.dylib ${MASON_PREFIX}/lib/libtbbmalloc_proxy.dylib
install_name_tool -change libtbbmalloc.dylib @rpath/libtbbmalloc.dylib ${MASON_PREFIX}/lib/libtbbmalloc_proxy.dylib
else
# the linux libraries are funky: the lib.so.2 is the real lib
# and the lib.so is an ascii text file, so we need to only copy
# the lib.so.2 and then recreate the lib.so as a relative symlink
# to the lib.so.2
create_links libtbbmalloc_proxy
create_links libtbbmalloc
create_links libtbb
fi
cp -r $(pwd)/include/tbb ${MASON_PREFIX}/include/
touch ${MASON_PREFIX}/bin/tbb
}
function mason_cflags {
echo "-I${MASON_PREFIX}/include"
}
function mason_static_libs {
:
}
function mason_ldflags {
echo "-L${MASON_PREFIX}/lib -ltbb"
}
function mason_clean {
make clean
}
mason_run "$@"