Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 1 addition & 14 deletions c_glib/doc/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,7 @@ gi_docgen = find_program('gi-docgen')

gi_docgen_toml_conf = configuration_data()
gi_docgen_toml_conf.set('SOURCE_REFERENCE', source_reference)
# We can't use "version.replace('-SNAPSHOT', '.dev')" here because
# Ubuntu 20.04's Meson is < 0.58.0.
if version_tag == ''
gi_docgen_version_tag = ''
else
# GI-DocGen doesn't like MAJOR.MINOR.PATCH-SNAPSHOT format.
gi_docgen_version_tag = '.dev'
endif
gi_docgen_version = '@0@.@1@.@2@@3@'.format(
version_major,
version_minor,
version_micro,
gi_docgen_version_tag,
)
gi_docgen_version = version.replace('-SNAPSHOT', '.dev')
gi_docgen_toml_conf.set('VERSION', gi_docgen_version)

gir_top_build_dir = meson.current_build_dir() / '..'
Expand Down
4 changes: 0 additions & 4 deletions ci/scripts/cpp_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -157,10 +157,6 @@ if [ "${ARROW_USE_MESON:-OFF}" = "ON" ]; then
CC="${ORIGINAL_CC}"
CXX="${ORIGINAL_CXX}"
elif [ "${ARROW_EMSCRIPTEN:-OFF}" = "ON" ]; then
if [ "${UBUNTU}" = "20.04" ]; then
echo "arrow emscripten build is not supported on Ubuntu 20.04, run with UBUNTU=22.04"
exit -1
fi
n_jobs=2 # Emscripten build fails on docker unless this is set really low
source ~/emsdk/emsdk_env.sh
export CMAKE_INSTALL_PREFIX=$(em-config CACHE)/sysroot
Expand Down
7 changes: 0 additions & 7 deletions ruby/red-arrow/ext/arrow/extconf.rb
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,6 @@
MESSAGE
end

# Old re2.pc (e.g. re2.pc on Ubuntu 20.04) may add -std=c++11. It
# causes a build error because Apache Arrow C++ requires C++17 or
# later.
#
# We can remove this when we drop support for Ubuntu 20.04.
$CXXFLAGS.gsub!("-std=c++11", "")

[
["glib2", "ext/glib2"],
].each do |name, relative_source_dir|
Expand Down
Loading