Update webrtc's abseil-cpp
Copy external/abseil-cpp into webrtc to update to version 20211102.0 to pick up changes that fix compiling against musl libc. Bug: 190084016 Test: m USE_HOST_MUSL=true host-native Test: m checkbuild Change-Id: I0ab600cd8db93a55eda8358cdbecd21c2f78d8fb
This commit is contained in:
Colin Cross
@ -18,10 +18,8 @@
|
||||
cmake_minimum_required(VERSION 3.5)
|
||||
project(absl_cmake_testing CXX)
|
||||
|
||||
set(CMAKE_CXX_STANDARD 11)
|
||||
|
||||
add_executable(simple simple.cc)
|
||||
|
||||
find_package(absl REQUIRED)
|
||||
|
||||
target_link_libraries(simple absl::strings)
|
||||
target_link_libraries(simple absl::strings absl::config)
|
||||
|
||||
@ -14,8 +14,17 @@
|
||||
// limitations under the License.
|
||||
|
||||
#include <iostream>
|
||||
#include "absl/base/config.h"
|
||||
#include "absl/strings/substitute.h"
|
||||
|
||||
#if !defined(ABSL_LTS_RELEASE_VERSION) || ABSL_LTS_RELEASE_VERSION != 99998877
|
||||
#error ABSL_LTS_RELEASE_VERSION is not set correctly.
|
||||
#endif
|
||||
|
||||
#if !defined(ABSL_LTS_RELEASE_PATCH_LEVEL) || ABSL_LTS_RELEASE_PATCH_LEVEL != 0
|
||||
#error ABSL_LTS_RELEASE_PATCH_LEVEL is not set correctly.
|
||||
#endif
|
||||
|
||||
int main(int argc, char** argv) {
|
||||
for (int i = 0; i < argc; ++i) {
|
||||
std::cout << absl::Substitute("Arg $0: $1\n", i, argv[i]);
|
||||
|
||||
164
third_party/abseil-cpp/CMake/install_test_project/test.sh
vendored
Normal file → Executable file
164
third_party/abseil-cpp/CMake/install_test_project/test.sh
vendored
Normal file → Executable file
@ -13,70 +13,60 @@
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
# "Unit" and integration tests for Absl CMake installation
|
||||
|
||||
# TODO(absl-team): This script isn't fully hermetic because
|
||||
# -DABSL_USE_GOOGLETEST_HEAD=ON means that this script isn't pinned to a fixed
|
||||
# version of GoogleTest. This means that an upstream change to GoogleTest could
|
||||
# break this test. Fix this by allowing this script to pin to a known-good
|
||||
# version of GoogleTest.
|
||||
#
|
||||
# Unit and integration tests for Abseil LTS CMake installation
|
||||
|
||||
# Fail on any error. Treat unset variables an error. Print commands as executed.
|
||||
set -euox pipefail
|
||||
|
||||
install_absl() {
|
||||
pushd "${absl_build_dir}"
|
||||
if [[ "${#}" -eq 1 ]]; then
|
||||
cmake -DCMAKE_INSTALL_PREFIX="${1}" "${absl_dir}"
|
||||
else
|
||||
cmake "${absl_dir}"
|
||||
fi
|
||||
cmake --build . --target install -- -j
|
||||
popd
|
||||
}
|
||||
|
||||
uninstall_absl() {
|
||||
xargs rm < "${absl_build_dir}"/install_manifest.txt
|
||||
rm -rf "${absl_build_dir}"
|
||||
mkdir -p "${absl_build_dir}"
|
||||
}
|
||||
|
||||
lts_install=""
|
||||
|
||||
while getopts ":l" lts; do
|
||||
case "${lts}" in
|
||||
l )
|
||||
lts_install="true"
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
absl_dir=/abseil-cpp
|
||||
absl_build_dir=/buildfs/absl-build
|
||||
absl_build_dir=/buildfs
|
||||
googletest_builddir=/googletest_builddir
|
||||
project_dir="${absl_dir}"/CMake/install_test_project
|
||||
project_build_dir=/buildfs/project-build
|
||||
|
||||
mkdir -p "${absl_build_dir}"
|
||||
build_shared_libs="OFF"
|
||||
if [ "${LINK_TYPE:-}" = "DYNAMIC" ]; then
|
||||
build_shared_libs="ON"
|
||||
fi
|
||||
|
||||
# Build and install GoogleTest
|
||||
mkdir "${googletest_builddir}"
|
||||
pushd "${googletest_builddir}"
|
||||
curl -L "${ABSL_GOOGLETEST_DOWNLOAD_URL}" --output "${ABSL_GOOGLETEST_COMMIT}".zip
|
||||
unzip "${ABSL_GOOGLETEST_COMMIT}".zip
|
||||
pushd "googletest-${ABSL_GOOGLETEST_COMMIT}"
|
||||
mkdir build
|
||||
pushd build
|
||||
cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS="${build_shared_libs}" ..
|
||||
make -j $(nproc)
|
||||
make install
|
||||
ldconfig
|
||||
popd
|
||||
popd
|
||||
popd
|
||||
|
||||
# Run the LTS transformations
|
||||
./create_lts.py 99998877
|
||||
|
||||
# Build and install Abseil
|
||||
pushd "${absl_build_dir}"
|
||||
cmake "${absl_dir}" \
|
||||
-DABSL_USE_EXTERNAL_GOOGLETEST=ON \
|
||||
-DABSL_FIND_GOOGLETEST=ON \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DBUILD_TESTING=ON \
|
||||
-DBUILD_SHARED_LIBS="${build_shared_libs}"
|
||||
make -j $(nproc)
|
||||
ctest -j $(nproc)
|
||||
make install
|
||||
ldconfig
|
||||
popd
|
||||
|
||||
# Test the project against the installed Abseil
|
||||
mkdir -p "${project_build_dir}"
|
||||
|
||||
if [[ "${lts_install}" ]]; then
|
||||
install_dir="/usr/local"
|
||||
else
|
||||
install_dir="${project_build_dir}"/install
|
||||
fi
|
||||
mkdir -p "${install_dir}"
|
||||
|
||||
# Test build, install, and link against installed abseil
|
||||
pushd "${project_build_dir}"
|
||||
if [[ "${lts_install}" ]]; then
|
||||
install_absl
|
||||
cmake "${project_dir}"
|
||||
else
|
||||
install_absl "${install_dir}"
|
||||
cmake "${project_dir}" -DCMAKE_PREFIX_PATH="${install_dir}"
|
||||
fi
|
||||
|
||||
cmake "${project_dir}"
|
||||
cmake --build . --target simple
|
||||
|
||||
output="$(${project_build_dir}/simple "printme" 2>&1)"
|
||||
@ -88,57 +78,35 @@ fi
|
||||
|
||||
popd
|
||||
|
||||
# Test that we haven't accidentally made absl::abslblah
|
||||
pushd "${install_dir}"
|
||||
|
||||
# Starting in CMake 3.12 the default install dir is lib$bit_width
|
||||
if [[ -d lib64 ]]; then
|
||||
libdir="lib64"
|
||||
elif [[ -d lib ]]; then
|
||||
libdir="lib"
|
||||
else
|
||||
echo "ls *, */*, */*/*:"
|
||||
ls *
|
||||
ls */*
|
||||
ls */*/*
|
||||
echo "unknown lib dir"
|
||||
fi
|
||||
|
||||
if [[ "${lts_install}" ]]; then
|
||||
# LTS versions append the date of the release to the subdir.
|
||||
# 9999/99/99 is the dummy date used in the local_lts workflow.
|
||||
absl_subdir="absl_99999999"
|
||||
else
|
||||
absl_subdir="absl"
|
||||
fi
|
||||
|
||||
if ! grep absl::strings "${libdir}/cmake/${absl_subdir}/abslTargets.cmake"; then
|
||||
cat "${libdir}"/cmake/absl/abslTargets.cmake
|
||||
if ! grep absl::strings "/usr/local/lib/cmake/absl/abslTargets.cmake"; then
|
||||
cat "/usr/local/lib/cmake/absl/abslTargets.cmake"
|
||||
echo "CMake targets named incorrectly"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
uninstall_absl
|
||||
popd
|
||||
pushd "${HOME}"
|
||||
cat > hello-abseil.cc << EOF
|
||||
#include <cstdlib>
|
||||
|
||||
if [[ ! "${lts_install}" ]]; then
|
||||
# Test that we warn if installed without a prefix or a system prefix
|
||||
output="$(install_absl 2>&1)"
|
||||
if [[ "${output}" != *"Please set CMAKE_INSTALL_PREFIX"* ]]; then
|
||||
echo "Install without prefix didn't warn as expected. Output:"
|
||||
echo "${output}"
|
||||
exit 1
|
||||
fi
|
||||
uninstall_absl
|
||||
#include "absl/strings/str_format.h"
|
||||
|
||||
output="$(install_absl /usr 2>&1)"
|
||||
if [[ "${output}" != *"Please set CMAKE_INSTALL_PREFIX"* ]]; then
|
||||
echo "Install with /usr didn't warn as expected. Output:"
|
||||
echo "${output}"
|
||||
exit 1
|
||||
fi
|
||||
uninstall_absl
|
||||
int main(int argc, char **argv) {
|
||||
absl::PrintF("Hello Abseil!\n");
|
||||
return EXIT_SUCCESS;
|
||||
}
|
||||
EOF
|
||||
|
||||
if [ "${LINK_TYPE:-}" != "DYNAMIC" ]; then
|
||||
pc_args=($(pkg-config --cflags --libs --static absl_str_format))
|
||||
g++ -static -o hello-abseil hello-abseil.cc "${pc_args[@]}"
|
||||
else
|
||||
pc_args=($(pkg-config --cflags --libs absl_str_format))
|
||||
g++ -o hello-abseil hello-abseil.cc "${pc_args[@]}"
|
||||
fi
|
||||
hello="$(./hello-abseil)"
|
||||
[[ "${hello}" == "Hello Abseil!" ]]
|
||||
|
||||
popd
|
||||
|
||||
echo "Install test complete!"
|
||||
exit 0
|
||||
|
||||
Reference in New Issue
Block a user