[Qt] Use C++11 ABI packages
These were causing linking errors on more recent Linux distros. Fixes #3123.
This commit is contained in:
@@ -12,10 +12,10 @@ LIBUV_VERSION=1.7.5
|
||||
ZLIB_VERSION=system
|
||||
NUNICODE_VERSION=1.6
|
||||
GEOMETRY_VERSION=0.3.0
|
||||
GEOJSONVT_VERSION=4.1.2
|
||||
GEOJSONVT_VERSION=4.1.2${CXX11ABI}
|
||||
VARIANT_VERSION=1.1.0
|
||||
RAPIDJSON_VERSION=1.0.2
|
||||
GTEST_VERSION=1.7.0
|
||||
GTEST_VERSION=1.7.0${CXX11ABI}
|
||||
PIXELMATCH_VERSION=0.9.0
|
||||
WEBP_VERSION=0.5.0
|
||||
|
||||
|
||||
@@ -3,8 +3,8 @@
|
||||
PROTOZERO_VERSION=1.3.0
|
||||
BOOST_VERSION=1.60.0
|
||||
GEOMETRY_VERSION=0.3.0
|
||||
GEOJSONVT_VERSION=4.1.2
|
||||
GTEST_VERSION=1.7.0
|
||||
GEOJSONVT_VERSION=4.1.2${CXX11ABI}
|
||||
GTEST_VERSION=1.7.0${CXX11ABI}
|
||||
LIBJPEG_TURBO_VERSION=1.4.2
|
||||
NUNICODE_VERSION=1.6
|
||||
PIXELMATCH_VERSION=0.9.0
|
||||
|
||||
BIN
scripts/check-cxx11abi.dat
Executable file
BIN
scripts/check-cxx11abi.dat
Executable file
Binary file not shown.
14
scripts/check-cxx11abi.sh
Executable file
14
scripts/check-cxx11abi.sh
Executable file
@@ -0,0 +1,14 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
set -e
|
||||
set -o pipefail
|
||||
|
||||
# check-cxx11abi.dat is a binary just so we can use the loader
|
||||
# to take care of finding the libstdc++ which can be tricky.
|
||||
LIBSTDCPP=$(ldd $(dirname $0)/check-cxx11abi.dat |grep libstdc++ |cut -d' ' -f3)
|
||||
|
||||
if [ $(readelf -Ws $LIBSTDCPP |c++filt |grep -c ::__cxx11::) -gt 0 ]; then
|
||||
echo "-cxx11abi"
|
||||
else
|
||||
echo ""
|
||||
fi
|
||||
@@ -2,6 +2,7 @@ ifeq ($(shell uname -s), Darwin)
|
||||
export PLATFORM ?= osx
|
||||
else ifeq ($(shell uname -s), Linux)
|
||||
export PLATFORM ?= linux
|
||||
export CXX11ABI = $(shell scripts/check-cxx11abi.sh)
|
||||
endif
|
||||
|
||||
ifeq ($(PLATFORM),android)
|
||||
@@ -48,6 +49,7 @@ ifeq ($(PLATFORM),qt)
|
||||
endif
|
||||
|
||||
# Defaults if not set
|
||||
export CXX11ABI ?= ""
|
||||
export PLATFORM_OUTPUT ?= ./build/$(PLATFORM_SLUG)
|
||||
export PLATFORM_CONFIG_INPUT ?= platform/$(MASON_PLATFORM)/scripts/configure.sh
|
||||
export PLATFORM_CONFIG_OUTPUT ?= $(PLATFORM_OUTPUT)/config.gypi
|
||||
|
||||
Reference in New Issue
Block a user