Skip to content
This repository was archived by the owner on Dec 16, 2020. It is now read-only.

build: drop GLib2 dependency in wee8. #153

Merged
PiotrSikora merged 2 commits into from
Aug 25, 2019
Merged

build: drop GLib2 dependency in wee8. #153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d3254ef
build: drop GLib2 dependency in wee8.
PiotrSikora Aug 25, 2019
866a707
review: re-add CMake for WAVM.
PiotrSikora Aug 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bazel/external/wee8.genrule_cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ pushd $$ROOT/wee8
rm -rf out/wee8

# Build wee8.
AR=ar NM=nm third_party/depot_tools/gn gen out/wee8 --args='v8_use_external_startup_data=false v8_enable_i18n_support=false v8_enable_gdbjit=false v8_expose_symbols=true is_component_build=false is_debug=false clang_use_chrome_plugins=false use_sysroot=false use_custom_libcxx=false custom_toolchain="//build/toolchain/linux/unbundle:default"'
AR=ar NM=nm third_party/depot_tools/gn gen out/wee8 --args='v8_use_external_startup_data=false v8_enable_i18n_support=false v8_enable_gdbjit=false v8_expose_symbols=true is_component_build=false is_debug=false clang_use_chrome_plugins=false use_sysroot=false use_custom_libcxx=false use_glib=false custom_toolchain="//build/toolchain/linux/unbundle:default"'
third_party/depot_tools/ninja -C out/wee8 wee8

# Move compiled library to the expected destinations.
Expand Down
6 changes: 4 additions & 2 deletions ci/build_container/build_container_centos.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,10 @@ set -e
yum install -y centos-release-scl epel-release
yum update -y
yum install -y devtoolset-7-gcc devtoolset-7-gcc-c++ devtoolset-7-binutils java-1.8.0-openjdk-headless rsync \
rh-git218 wget unzip which make patch devtoolset-7-libatomic-devel openssl python27 \
libtool autoconf tcpdump glib2-devel
rh-git218 wget unzip which make patch ninja-build devtoolset-7-libatomic-devel openssl python27 \
libtool autoconf tcpdump

ln -s /usr/bin/ninja-build /usr/bin/ninja

# SLES 11 has older glibc than CentOS 7, so pre-built binary for it works on CentOS 7
LLVM_VERSION=8.0.0
Expand Down
8 changes: 0 additions & 8 deletions ci/build_container/build_container_common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,4 @@ if [[ "$(uname -m)" == "x86_64" ]]; then
curl -sLo cmake-"$VERSION".tar.gz https://github.com/Kitware/CMake/releases/download/v"$VERSION"/cmake-"$VERSION"-Linux-x86_64.tar.gz \
&& echo "$SHA256" cmake-"$VERSION".tar.gz | sha256sum --check \
&& tar -zxf cmake-"$VERSION".tar.gz -C /usr --strip-components=1

# ninja
VERSION=1.8.2
SHA256=d2fea9ff33b3ef353161ed906f260d565ca55b8ca0568fa07b1d2cab90a84a07
curl -sLo ninja-"$VERSION".zip https://github.com/ninja-build/ninja/releases/download/v"$VERSION"/ninja-linux.zip \
&& echo "$SHA256" ninja-"$VERSION".zip | sha256sum --check \
&& unzip ninja-"$VERSION".zip \
&& mv ninja /usr/bin
fi
2 changes: 1 addition & 1 deletion ci/build_container/build_container_ubuntu.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ update-alternatives --config gcc
update-alternatives --config g++

apt-get install -y --no-install-recommends curl wget make git python python-pip python-setuptools python3 python3-pip \
unzip bc libtool automake zip time gdb strace tshark tcpdump patch xz-utils rsync ssh-client libglib2.0-dev
unzip bc libtool ninja-build automake zip time gdb strace tshark tcpdump patch xz-utils rsync ssh-client

# clang 8.
case $ARCH in
Expand Down