GH-43228: [C++] Fix Abseil compile error on GCC 13#43157

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
assignUser merged 21 commits into from
Jul 26, 2024
Merged

GH-43228: [C++] Fix Abseil compile error on GCC 13 #43157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
1cba3ce
Include stdint on GCC13
amol- Jul 5, 2024
7a3f0ab
Lint
amol- Jul 5, 2024
ed6ca2f
Update cpp/cmake_modules/ThirdpartyToolchain.cmake
amol- Jul 23, 2024
0fb0f12
Add GCC-13 test environment
amol- Jul 24, 2024
6066c86
Test in CPP env instead of R env
amol- Jul 24, 2024
f6bccb9
Build third party dependencies
amol- Jul 24, 2024
b0185f3
Build only ABSL as bundled
amol- Jul 24, 2024
2a11108
Profobuf must be bundled if absl is bundled
amol- Jul 24, 2024
d707350
ops, typo
amol- Jul 24, 2024
d03855a
Switch to bundled image
amol- Jul 24, 2024
e757478
Add ubuntu 24.04 minimal
amol- Jul 24, 2024
a55a5d8
Temporarily add verbose for debugging
amol- Jul 24, 2024
76c149e
Try to disable ccache temporarily
amol- Jul 24, 2024
0fe54c2
Add verbose third party builds for debugging
amol- Jul 25, 2024
adac2e0
Try to propagate CXX flags
amol- Jul 25, 2024
1b61d03
strip spaces in flags
amol- Jul 25, 2024
d59f39b
Specify CMAKE_ARGS explicitly for ABSL
amol- Jul 25, 2024
70e6e7d
Remove unecessary strip
amol- Jul 25, 2024
1a12ea6
Remove debugging flags
amol- Jul 25, 2024
943baa0
Add tzdata-legacy
amol- Jul 25, 2024
0a6e367
Remove workaround for GCS
amol- Jul 26, 2024
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
104 changes: 104 additions & 0 deletions ci/docker/ubuntu-24.04-cpp-minimal.dockerfile
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, 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.

ARG base=amd64/ubuntu:24.04
FROM ${base}

SHELL ["/bin/bash", "-o", "pipefail", "-c"]

RUN echo "debconf debconf/frontend select Noninteractive" | \
debconf-set-selections

RUN apt-get update -y -q && \
apt-get install -y -q \
build-essential \
ccache \
cmake \
curl \
git \
libssl-dev \
libcurl4-openssl-dev \
python3-pip \
tzdata \
tzdata-legacy \
wget && \
apt-get clean && \
rm -rf /var/lib/apt/lists*

# Installs LLVM toolchain, for Gandiva and testing other compilers
#
# Note that this is installed before the base packages to improve iteration
# while debugging package list with docker build.
ARG llvm
RUN latest_system_llvm=14 && \
if [ ${llvm} -gt ${latest_system_llvm} ]; then \
apt-get update -y -q && \
apt-get install -y -q --no-install-recommends \
apt-transport-https \
ca-certificates \
gnupg \
lsb-release \
wget && \
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - && \
code_name=$(lsb_release --codename --short) && \
if [ ${llvm} -gt 10 ]; then \
echo "deb https://apt.llvm.org/${code_name}/ llvm-toolchain-${code_name}-${llvm} main" > \
/etc/apt/sources.list.d/llvm.list; \
fi; \
fi && \
apt-get update -y -q && \
apt-get install -y -q --no-install-recommends \
clang-${llvm} \
llvm-${llvm}-dev && \
apt-get clean && \
rm -rf /var/lib/apt/lists*

COPY ci/scripts/install_minio.sh /arrow/ci/scripts/
RUN /arrow/ci/scripts/install_minio.sh latest /usr/local

COPY ci/scripts/install_gcs_testbench.sh /arrow/ci/scripts/
RUN /arrow/ci/scripts/install_gcs_testbench.sh default

COPY ci/scripts/install_sccache.sh /arrow/ci/scripts/
RUN /arrow/ci/scripts/install_sccache.sh unknown-linux-musl /usr/local/bin

ENV ARROW_ACERO=ON \
ARROW_AZURE=OFF \
ARROW_BUILD_TESTS=ON \
ARROW_DATASET=ON \
ARROW_FLIGHT=ON \
ARROW_GANDIVA=ON \
ARROW_GCS=ON \
ARROW_HDFS=ON \
ARROW_HOME=/usr/local \
ARROW_INSTALL_NAME_RPATH=OFF \
ARROW_ORC=ON \
ARROW_PARQUET=ON \
ARROW_S3=ON \
ARROW_USE_CCACHE=ON \
ARROW_WITH_BROTLI=ON \
ARROW_WITH_BZ2=ON \
ARROW_WITH_LZ4=ON \
ARROW_WITH_OPENTELEMETRY=OFF \
ARROW_WITH_SNAPPY=ON \
ARROW_WITH_ZLIB=ON \
ARROW_WITH_ZSTD=ON \
CMAKE_GENERATOR="Unix Makefiles" \
PARQUET_BUILD_EXAMPLES=ON \
PARQUET_BUILD_EXECUTABLES=ON \
PATH=/usr/lib/ccache/:$PATH \
PYTHON=python3
4 changes: 4 additions & 0 deletions cpp/cmake_modules/ThirdpartyToolchain.cmake
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2882,6 +2882,10 @@ macro(build_absl)
set(ABSL_INCLUDE_DIR "${ABSL_PREFIX}/include")
set(ABSL_CMAKE_ARGS "${EP_COMMON_CMAKE_ARGS}" -DABSL_RUN_TESTS=OFF
"-DCMAKE_INSTALL_PREFIX=${ABSL_PREFIX}")
if(CMAKE_COMPILER_IS_GNUCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 13.0)
set(ABSL_CXX_FLAGS "${EP_CXX_FLAGS} -include stdint.h")
list(APPEND ABSL_CMAKE_ARGS "-DCMAKE_CXX_FLAGS=${ABSL_CXX_FLAGS}")
endif()
set(ABSL_BUILD_BYPRODUCTS)
set(ABSL_LIBRARIES)

Expand Down
9 changes: 9 additions & 0 deletions dev/tasks/tasks.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1058,6 +1058,15 @@ tasks:
UBUNTU: 20.04
image: ubuntu-cpp-bundled

test-ubuntu-24.04-cpp-gcc-13-bundled:
ci: github
template: docker-tests/github.linux.yml
params:
env:
UBUNTU: 24.04
GCC_VERSION: 13
image: ubuntu-cpp-bundled

test-ubuntu-24.04-cpp:
ci: github
template: docker-tests/github.linux.yml
Expand Down
14 changes: 0 additions & 14 deletions r/configure
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -95,20 +95,6 @@ if [ ! "`${R_HOME}/bin/R CMD config CXX17`" ]; then
exit 1
fi

# GH-36969: The version of Abseil used in the bundled build won't build on
# gcc-13. As a workaround for the 13.0.0 release, explicitly set
# ARROW_WITH_GOOGLE_CLOUD_CPP to OFF (if not already set)
if [ -z "$ARROW_GCS" ]; then
CXX17=`${R_HOME}/bin/R CMD config CXX17`
CXX17_VERSION=`$CXX17 --version`
if echo "$CXX17_VERSION" | grep -e "g++" > /dev/null ; then
if echo "$CXX17_VERSION" | grep -e "13.[0-9]\+.[0-9]\+" > /dev/null ; then
echo "*** Disabling Arrow build with GCS on gcc-13."
echo "*** Set ARROW_GCS=ON to explicitly enable."
export ARROW_GCS="OFF"
fi
fi
fi

# Test if pkg-config is available to use
if ${PKG_CONFIG} --version >/dev/null 2>&1; then
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
GH-43228: [C++] Fix Abseil compile error on GCC 13#43157

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

assignUser
merged 21 commits into

from

Jul 26, 2024
 Merged


GH-43228: [C++] Fix Abseil compile error on GCC 13
#43157
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


21 commits


Select commit
Hold shift + click to select a range
1cba3ce

Include stdint on GCC13


amol- Jul 5, 2024
7a3f0ab

Lint


amol- Jul 5, 2024
ed6ca2f

Update cpp/cmake_modules/ThirdpartyToolchain.cmake


amol- Jul 23, 2024
0fb0f12

Add GCC-13 test environment


amol- Jul 24, 2024
6066c86

Test in CPP env instead of R env


amol- Jul 24, 2024
f6bccb9

Build third party dependencies


amol- Jul 24, 2024
b0185f3

Build only ABSL as bundled


amol- Jul 24, 2024
2a11108

Profobuf must be bundled if absl is bundled


amol- Jul 24, 2024
d707350

ops, typo


amol- Jul 24, 2024
d03855a

Switch to bundled image


amol- Jul 24, 2024
e757478

Add ubuntu 24.04 minimal


amol- Jul 24, 2024
a55a5d8

Temporarily add verbose for debugging


amol- Jul 24, 2024
76c149e

Try to disable ccache temporarily


amol- Jul 24, 2024
0fe54c2

Add verbose third party builds for debugging


amol- Jul 25, 2024
adac2e0

Try to propagate CXX flags


amol- Jul 25, 2024
1b61d03

strip spaces in flags


amol- Jul 25, 2024
d59f39b

Specify CMAKE_ARGS explicitly for ABSL


amol- Jul 25, 2024
70e6e7d

Remove unecessary strip


amol- Jul 25, 2024
1a12ea6

Remove debugging flags


amol- Jul 25, 2024
943baa0

Add tzdata-legacy


amol- Jul 25, 2024
0a6e367

Remove workaround for GCS


amol- Jul 26, 2024

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


104 changes: 104 additions & 0 deletions
ci/docker/ubuntu-24.04-cpp-minimal.dockerfile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, 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.

ARG base=amd64/ubuntu:24.04
FROM ${base}

SHELL ["/bin/bash", "-o", "pipefail", "-c"]

RUN echo "debconf debconf/frontend select Noninteractive" | \
 debconf-set-selections

RUN apt-get update -y -q && \
 apt-get install -y -q \
 build-essential \
 ccache \
 cmake \
 curl \
 git \
 libssl-dev \
 libcurl4-openssl-dev \
 python3-pip \
 tzdata \
 tzdata-legacy \
 wget && \
 apt-get clean && \
 rm -rf /var/lib/apt/lists*

# Installs LLVM toolchain, for Gandiva and testing other compilers
#
# Note that this is installed before the base packages to improve iteration
# while debugging package list with docker build.
ARG llvm
RUN latest_system_llvm=14 && \
 if [ ${llvm} -gt ${latest_system_llvm} ]; then \
 apt-get update -y -q && \
 apt-get install -y -q --no-install-recommends \
 apt-transport-https \
 ca-certificates \
 gnupg \
 lsb-release \
 wget && \
 wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - && \
 code_name=$(lsb_release --codename --short) && \
 if [ ${llvm} -gt 10 ]; then \
 echo "deb https://apt.llvm.org/${code_name}/ llvm-toolchain-${code_name}-${llvm} main" > \
 /etc/apt/sources.list.d/llvm.list; \
 fi; \
 fi && \
 apt-get update -y -q && \
 apt-get install -y -q --no-install-recommends \
 clang-${llvm} \
 llvm-${llvm}-dev && \
 apt-get clean && \
 rm -rf /var/lib/apt/lists*

COPY ci/scripts/install_minio.sh /arrow/ci/scripts/
RUN /arrow/ci/scripts/install_minio.sh latest /usr/local

COPY ci/scripts/install_gcs_testbench.sh /arrow/ci/scripts/
RUN /arrow/ci/scripts/install_gcs_testbench.sh default

COPY ci/scripts/install_sccache.sh /arrow/ci/scripts/
RUN /arrow/ci/scripts/install_sccache.sh unknown-linux-musl /usr/local/bin

ENV ARROW_ACERO=ON \
 ARROW_AZURE=OFF \
 ARROW_BUILD_TESTS=ON \
 ARROW_DATASET=ON \
 ARROW_FLIGHT=ON \
 ARROW_GANDIVA=ON \
 ARROW_GCS=ON \
 ARROW_HDFS=ON \
 ARROW_HOME=/usr/local \
 ARROW_INSTALL_NAME_RPATH=OFF \
 ARROW_ORC=ON \
 ARROW_PARQUET=ON \
 ARROW_S3=ON \
 ARROW_USE_CCACHE=ON \
 ARROW_WITH_BROTLI=ON \
 ARROW_WITH_BZ2=ON \
 ARROW_WITH_LZ4=ON \
 ARROW_WITH_OPENTELEMETRY=OFF \
 ARROW_WITH_SNAPPY=ON \
 ARROW_WITH_ZLIB=ON \
 ARROW_WITH_ZSTD=ON \
 CMAKE_GENERATOR="Unix Makefiles" \
 PARQUET_BUILD_EXAMPLES=ON \
 PARQUET_BUILD_EXECUTABLES=ON \
 PATH=/usr/lib/ccache/:$PATH \
 PYTHON=python3

4 changes: 4 additions & 0 deletions
cpp/cmake_modules/ThirdpartyToolchain.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2882,6 +2882,10 @@ macro(build_absl)
 set(ABSL_INCLUDE_DIR "${ABSL_PREFIX}/include")
 set(ABSL_CMAKE_ARGS "${EP_COMMON_CMAKE_ARGS}" -DABSL_RUN_TESTS=OFF
 "-DCMAKE_INSTALL_PREFIX=${ABSL_PREFIX}")
 if(CMAKE_COMPILER_IS_GNUCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 13.0)
 set(ABSL_CXX_FLAGS "${EP_CXX_FLAGS} -include stdint.h")
 list(APPEND ABSL_CMAKE_ARGS "-DCMAKE_CXX_FLAGS=${ABSL_CXX_FLAGS}")
 endif()
 set(ABSL_BUILD_BYPRODUCTS)
 set(ABSL_LIBRARIES)

Expand Down

9 changes: 9 additions & 0 deletions
dev/tasks/tasks.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1058,6 +1058,15 @@ tasks:
 UBUNTU: 20.04
 image: ubuntu-cpp-bundled

 test-ubuntu-24.04-cpp-gcc-13-bundled:
 ci: github
 template: docker-tests/github.linux.yml
 params:
 env:
 UBUNTU: 24.04
 GCC_VERSION: 13
 image: ubuntu-cpp-bundled

 test-ubuntu-24.04-cpp:
 ci: github
 template: docker-tests/github.linux.yml
Expand Down

14 changes: 0 additions & 14 deletions
r/configure

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -95,20 +95,6 @@ if [ ! "`${R_HOME}/bin/R CMD config CXX17`" ]; then
 exit 1
fi

# GH-36969: The version of Abseil used in the bundled build won't build on
# gcc-13. As a workaround for the 13.0.0 release, explicitly set
# ARROW_WITH_GOOGLE_CLOUD_CPP to OFF (if not already set)
if [ -z "$ARROW_GCS" ]; then
 CXX17=`${R_HOME}/bin/R CMD config CXX17`
 CXX17_VERSION=`$CXX17 --version`
 if echo "$CXX17_VERSION" | grep -e "g++" > /dev/null ; then
 if echo "$CXX17_VERSION" | grep -e "13.[0-9]\+.[0-9]\+" > /dev/null ; then
 echo "*** Disabling Arrow build with GCS on gcc-13."
 echo "*** Set ARROW_GCS=ON to explicitly enable."
 export ARROW_GCS="OFF"
 fi
 fi
fi

# Test if pkg-config is available to use
if ${PKG_CONFIG} --version >/dev/null 2>&1; then
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
GH-43228: [C++] Fix Abseil compile error on GCC 13#43157

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

assignUser
merged 21 commits into

from

Jul 26, 2024
 Merged


GH-43228: [C++] Fix Abseil compile error on GCC 13
#43157
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


21 commits


Select commit
Hold shift + click to select a range
1cba3ce

Include stdint on GCC13


amol- Jul 5, 2024
7a3f0ab

Lint


amol- Jul 5, 2024
ed6ca2f

Update cpp/cmake_modules/ThirdpartyToolchain.cmake


amol- Jul 23, 2024
0fb0f12

Add GCC-13 test environment


amol- Jul 24, 2024
6066c86

Test in CPP env instead of R env


amol- Jul 24, 2024
f6bccb9

Build third party dependencies


amol- Jul 24, 2024
b0185f3

Build only ABSL as bundled


amol- Jul 24, 2024
2a11108

Profobuf must be bundled if absl is bundled


amol- Jul 24, 2024
d707350

ops, typo


amol- Jul 24, 2024
d03855a

Switch to bundled image


amol- Jul 24, 2024
e757478

Add ubuntu 24.04 minimal


amol- Jul 24, 2024
a55a5d8

Temporarily add verbose for debugging


amol- Jul 24, 2024
76c149e

Try to disable ccache temporarily


amol- Jul 24, 2024
0fe54c2

Add verbose third party builds for debugging


amol- Jul 25, 2024
adac2e0

Try to propagate CXX flags


amol- Jul 25, 2024
1b61d03

strip spaces in flags


amol- Jul 25, 2024
d59f39b

Specify CMAKE_ARGS explicitly for ABSL


amol- Jul 25, 2024
70e6e7d

Remove unecessary strip


amol- Jul 25, 2024
1a12ea6

Remove debugging flags


amol- Jul 25, 2024
943baa0

Add tzdata-legacy


amol- Jul 25, 2024
0a6e367

Remove workaround for GCS


amol- Jul 26, 2024

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


104 changes: 104 additions & 0 deletions
ci/docker/ubuntu-24.04-cpp-minimal.dockerfile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, 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.

ARG base=amd64/ubuntu:24.04
FROM ${base}

SHELL ["/bin/bash", "-o", "pipefail", "-c"]

RUN echo "debconf debconf/frontend select Noninteractive" | \
 debconf-set-selections

RUN apt-get update -y -q && \
 apt-get install -y -q \
 build-essential \
 ccache \
 cmake \
 curl \
 git \
 libssl-dev \
 libcurl4-openssl-dev \
 python3-pip \
 tzdata \
 tzdata-legacy \
 wget && \
 apt-get clean && \
 rm -rf /var/lib/apt/lists*

# Installs LLVM toolchain, for Gandiva and testing other compilers
#
# Note that this is installed before the base packages to improve iteration
# while debugging package list with docker build.
ARG llvm
RUN latest_system_llvm=14 && \
 if [ ${llvm} -gt ${latest_system_llvm} ]; then \
 apt-get update -y -q && \
 apt-get install -y -q --no-install-recommends \
 apt-transport-https \
 ca-certificates \
 gnupg \
 lsb-release \
 wget && \
 wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - && \
 code_name=$(lsb_release --codename --short) && \
 if [ ${llvm} -gt 10 ]; then \
 echo "deb https://apt.llvm.org/${code_name}/ llvm-toolchain-${code_name}-${llvm} main" > \
 /etc/apt/sources.list.d/llvm.list; \
 fi; \
 fi && \
 apt-get update -y -q && \
 apt-get install -y -q --no-install-recommends \
 clang-${llvm} \
 llvm-${llvm}-dev && \
 apt-get clean && \
 rm -rf /var/lib/apt/lists*

COPY ci/scripts/install_minio.sh /arrow/ci/scripts/
RUN /arrow/ci/scripts/install_minio.sh latest /usr/local

COPY ci/scripts/install_gcs_testbench.sh /arrow/ci/scripts/
RUN /arrow/ci/scripts/install_gcs_testbench.sh default

COPY ci/scripts/install_sccache.sh /arrow/ci/scripts/
RUN /arrow/ci/scripts/install_sccache.sh unknown-linux-musl /usr/local/bin

ENV ARROW_ACERO=ON \
 ARROW_AZURE=OFF \
 ARROW_BUILD_TESTS=ON \
 ARROW_DATASET=ON \
 ARROW_FLIGHT=ON \
 ARROW_GANDIVA=ON \
 ARROW_GCS=ON \
 ARROW_HDFS=ON \
 ARROW_HOME=/usr/local \
 ARROW_INSTALL_NAME_RPATH=OFF \
 ARROW_ORC=ON \
 ARROW_PARQUET=ON \
 ARROW_S3=ON \
 ARROW_USE_CCACHE=ON \
 ARROW_WITH_BROTLI=ON \
 ARROW_WITH_BZ2=ON \
 ARROW_WITH_LZ4=ON \
 ARROW_WITH_OPENTELEMETRY=OFF \
 ARROW_WITH_SNAPPY=ON \
 ARROW_WITH_ZLIB=ON \
 ARROW_WITH_ZSTD=ON \
 CMAKE_GENERATOR="Unix Makefiles" \
 PARQUET_BUILD_EXAMPLES=ON \
 PARQUET_BUILD_EXECUTABLES=ON \
 PATH=/usr/lib/ccache/:$PATH \
 PYTHON=python3

4 changes: 4 additions & 0 deletions
cpp/cmake_modules/ThirdpartyToolchain.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2882,6 +2882,10 @@ macro(build_absl)
 set(ABSL_INCLUDE_DIR "${ABSL_PREFIX}/include")
 set(ABSL_CMAKE_ARGS "${EP_COMMON_CMAKE_ARGS}" -DABSL_RUN_TESTS=OFF
 "-DCMAKE_INSTALL_PREFIX=${ABSL_PREFIX}")
 if(CMAKE_COMPILER_IS_GNUCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 13.0)
 set(ABSL_CXX_FLAGS "${EP_CXX_FLAGS} -include stdint.h")
 list(APPEND ABSL_CMAKE_ARGS "-DCMAKE_CXX_FLAGS=${ABSL_CXX_FLAGS}")
 endif()
 set(ABSL_BUILD_BYPRODUCTS)
 set(ABSL_LIBRARIES)

Expand Down

9 changes: 9 additions & 0 deletions
dev/tasks/tasks.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1058,6 +1058,15 @@ tasks:
 UBUNTU: 20.04
 image: ubuntu-cpp-bundled

 test-ubuntu-24.04-cpp-gcc-13-bundled:
 ci: github
 template: docker-tests/github.linux.yml
 params:
 env:
 UBUNTU: 24.04
 GCC_VERSION: 13
 image: ubuntu-cpp-bundled

 test-ubuntu-24.04-cpp:
 ci: github
 template: docker-tests/github.linux.yml
Expand Down

14 changes: 0 additions & 14 deletions
r/configure

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -95,20 +95,6 @@ if [ ! "`${R_HOME}/bin/R CMD config CXX17`" ]; then
 exit 1
fi

# GH-36969: The version of Abseil used in the bundled build won't build on
# gcc-13. As a workaround for the 13.0.0 release, explicitly set
# ARROW_WITH_GOOGLE_CLOUD_CPP to OFF (if not already set)
if [ -z "$ARROW_GCS" ]; then
 CXX17=`${R_HOME}/bin/R CMD config CXX17`
 CXX17_VERSION=`$CXX17 --version`
 if echo "$CXX17_VERSION" | grep -e "g++" > /dev/null ; then
 if echo "$CXX17_VERSION" | grep -e "13.[0-9]\+.[0-9]\+" > /dev/null ; then
 echo "*** Disabling Arrow build with GCS on gcc-13."
 echo "*** Set ARROW_GCS=ON to explicitly enable."
 export ARROW_GCS="OFF"
 fi
 fi
fi

# Test if pkg-config is available to use
if ${PKG_CONFIG} --version >/dev/null 2>&1; then
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
GH-43228: [C++] Fix Abseil compile error on GCC 13#43157

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

assignUser
merged 21 commits into

from

Jul 26, 2024
 Merged


GH-43228: [C++] Fix Abseil compile error on GCC 13
#43157
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


21 commits


Select commit
Hold shift + click to select a range
1cba3ce

Include stdint on GCC13


amol- Jul 5, 2024
7a3f0ab

Lint


amol- Jul 5, 2024
ed6ca2f

Update cpp/cmake_modules/ThirdpartyToolchain.cmake


amol- Jul 23, 2024
0fb0f12

Add GCC-13 test environment


amol- Jul 24, 2024
6066c86

Test in CPP env instead of R env


amol- Jul 24, 2024
f6bccb9

Build third party dependencies


amol- Jul 24, 2024
b0185f3

Build only ABSL as bundled


amol- Jul 24, 2024
2a11108

Profobuf must be bundled if absl is bundled


amol- Jul 24, 2024
d707350

ops, typo


amol- Jul 24, 2024
d03855a

Switch to bundled image


amol- Jul 24, 2024
e757478

Add ubuntu 24.04 minimal


amol- Jul 24, 2024
a55a5d8

Temporarily add verbose for debugging


amol- Jul 24, 2024
76c149e

Try to disable ccache temporarily


amol- Jul 24, 2024
0fe54c2

Add verbose third party builds for debugging


amol- Jul 25, 2024
adac2e0

Try to propagate CXX flags


amol- Jul 25, 2024
1b61d03

strip spaces in flags


amol- Jul 25, 2024
d59f39b

Specify CMAKE_ARGS explicitly for ABSL


amol- Jul 25, 2024
70e6e7d

Remove unecessary strip


amol- Jul 25, 2024
1a12ea6

Remove debugging flags


amol- Jul 25, 2024
943baa0

Add tzdata-legacy


amol- Jul 25, 2024
0a6e367

Remove workaround for GCS


amol- Jul 26, 2024

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


104 changes: 104 additions & 0 deletions
ci/docker/ubuntu-24.04-cpp-minimal.dockerfile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, 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.

ARG base=amd64/ubuntu:24.04
FROM ${base}

SHELL ["/bin/bash", "-o", "pipefail", "-c"]

RUN echo "debconf debconf/frontend select Noninteractive" | \
 debconf-set-selections

RUN apt-get update -y -q && \
 apt-get install -y -q \
 build-essential \
 ccache \
 cmake \
 curl \
 git \
 libssl-dev \
 libcurl4-openssl-dev \
 python3-pip \
 tzdata \
 tzdata-legacy \
 wget && \
 apt-get clean && \
 rm -rf /var/lib/apt/lists*

# Installs LLVM toolchain, for Gandiva and testing other compilers
#
# Note that this is installed before the base packages to improve iteration
# while debugging package list with docker build.
ARG llvm
RUN latest_system_llvm=14 && \
 if [ ${llvm} -gt ${latest_system_llvm} ]; then \
 apt-get update -y -q && \
 apt-get install -y -q --no-install-recommends \
 apt-transport-https \
 ca-certificates \
 gnupg \
 lsb-release \
 wget && \
 wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - && \
 code_name=$(lsb_release --codename --short) && \
 if [ ${llvm} -gt 10 ]; then \
 echo "deb https://apt.llvm.org/${code_name}/ llvm-toolchain-${code_name}-${llvm} main" > \
 /etc/apt/sources.list.d/llvm.list; \
 fi; \
 fi && \
 apt-get update -y -q && \
 apt-get install -y -q --no-install-recommends \
 clang-${llvm} \
 llvm-${llvm}-dev && \
 apt-get clean && \
 rm -rf /var/lib/apt/lists*

COPY ci/scripts/install_minio.sh /arrow/ci/scripts/
RUN /arrow/ci/scripts/install_minio.sh latest /usr/local

COPY ci/scripts/install_gcs_testbench.sh /arrow/ci/scripts/
RUN /arrow/ci/scripts/install_gcs_testbench.sh default

COPY ci/scripts/install_sccache.sh /arrow/ci/scripts/
RUN /arrow/ci/scripts/install_sccache.sh unknown-linux-musl /usr/local/bin

ENV ARROW_ACERO=ON \
 ARROW_AZURE=OFF \
 ARROW_BUILD_TESTS=ON \
 ARROW_DATASET=ON \
 ARROW_FLIGHT=ON \
 ARROW_GANDIVA=ON \
 ARROW_GCS=ON \
 ARROW_HDFS=ON \
 ARROW_HOME=/usr/local \
 ARROW_INSTALL_NAME_RPATH=OFF \
 ARROW_ORC=ON \
 ARROW_PARQUET=ON \
 ARROW_S3=ON \
 ARROW_USE_CCACHE=ON \
 ARROW_WITH_BROTLI=ON \
 ARROW_WITH_BZ2=ON \
 ARROW_WITH_LZ4=ON \
 ARROW_WITH_OPENTELEMETRY=OFF \
 ARROW_WITH_SNAPPY=ON \
 ARROW_WITH_ZLIB=ON \
 ARROW_WITH_ZSTD=ON \
 CMAKE_GENERATOR="Unix Makefiles" \
 PARQUET_BUILD_EXAMPLES=ON \
 PARQUET_BUILD_EXECUTABLES=ON \
 PATH=/usr/lib/ccache/:$PATH \
 PYTHON=python3

4 changes: 4 additions & 0 deletions
cpp/cmake_modules/ThirdpartyToolchain.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2882,6 +2882,10 @@ macro(build_absl)
 set(ABSL_INCLUDE_DIR "${ABSL_PREFIX}/include")
 set(ABSL_CMAKE_ARGS "${EP_COMMON_CMAKE_ARGS}" -DABSL_RUN_TESTS=OFF
 "-DCMAKE_INSTALL_PREFIX=${ABSL_PREFIX}")
 if(CMAKE_COMPILER_IS_GNUCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 13.0)
 set(ABSL_CXX_FLAGS "${EP_CXX_FLAGS} -include stdint.h")
 list(APPEND ABSL_CMAKE_ARGS "-DCMAKE_CXX_FLAGS=${ABSL_CXX_FLAGS}")
 endif()
 set(ABSL_BUILD_BYPRODUCTS)
 set(ABSL_LIBRARIES)

Expand Down

9 changes: 9 additions & 0 deletions
dev/tasks/tasks.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1058,6 +1058,15 @@ tasks:
 UBUNTU: 20.04
 image: ubuntu-cpp-bundled

 test-ubuntu-24.04-cpp-gcc-13-bundled:
 ci: github
 template: docker-tests/github.linux.yml
 params:
 env:
 UBUNTU: 24.04
 GCC_VERSION: 13
 image: ubuntu-cpp-bundled

 test-ubuntu-24.04-cpp:
 ci: github
 template: docker-tests/github.linux.yml
Expand Down

14 changes: 0 additions & 14 deletions
r/configure

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -95,20 +95,6 @@ if [ ! "`${R_HOME}/bin/R CMD config CXX17`" ]; then
 exit 1
fi

# GH-36969: The version of Abseil used in the bundled build won't build on
# gcc-13. As a workaround for the 13.0.0 release, explicitly set
# ARROW_WITH_GOOGLE_CLOUD_CPP to OFF (if not already set)
if [ -z "$ARROW_GCS" ]; then
 CXX17=`${R_HOME}/bin/R CMD config CXX17`
 CXX17_VERSION=`$CXX17 --version`
 if echo "$CXX17_VERSION" | grep -e "g++" > /dev/null ; then
 if echo "$CXX17_VERSION" | grep -e "13.[0-9]\+.[0-9]\+" > /dev/null ; then
 echo "*** Disabling Arrow build with GCS on gcc-13."
 echo "*** Set ARROW_GCS=ON to explicitly enable."
 export ARROW_GCS="OFF"
 fi
 fi
fi

# Test if pkg-config is available to use
if ${PKG_CONFIG} --version >/dev/null 2>&1; then
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
GH-43228: [C++] Fix Abseil compile error on GCC 13#43157

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

assignUser
merged 21 commits into

from

Jul 26, 2024
 Merged


GH-43228: [C++] Fix Abseil compile error on GCC 13
#43157
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


21 commits


Select commit
Hold shift + click to select a range
1cba3ce

Include stdint on GCC13


amol- Jul 5, 2024
7a3f0ab

Lint


amol- Jul 5, 2024
ed6ca2f

Update cpp/cmake_modules/ThirdpartyToolchain.cmake


amol- Jul 23, 2024
0fb0f12

Add GCC-13 test environment


amol- Jul 24, 2024
6066c86

Test in CPP env instead of R env


amol- Jul 24, 2024
f6bccb9

Build third party dependencies


amol- Jul 24, 2024
b0185f3

Build only ABSL as bundled


amol- Jul 24, 2024
2a11108

Profobuf must be bundled if absl is bundled


amol- Jul 24, 2024
d707350

ops, typo


amol- Jul 24, 2024
d03855a

Switch to bundled image


amol- Jul 24, 2024
e757478

Add ubuntu 24.04 minimal


amol- Jul 24, 2024
a55a5d8

Temporarily add verbose for debugging


amol- Jul 24, 2024
76c149e

Try to disable ccache temporarily


amol- Jul 24, 2024
0fe54c2

Add verbose third party builds for debugging


amol- Jul 25, 2024
adac2e0

Try to propagate CXX flags


amol- Jul 25, 2024
1b61d03

strip spaces in flags


amol- Jul 25, 2024
d59f39b

Specify CMAKE_ARGS explicitly for ABSL


amol- Jul 25, 2024
70e6e7d

Remove unecessary strip


amol- Jul 25, 2024
1a12ea6

Remove debugging flags


amol- Jul 25, 2024
943baa0

Add tzdata-legacy


amol- Jul 25, 2024
0a6e367

Remove workaround for GCS


amol- Jul 26, 2024

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


104 changes: 104 additions & 0 deletions
ci/docker/ubuntu-24.04-cpp-minimal.dockerfile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, 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.

ARG base=amd64/ubuntu:24.04
FROM ${base}

SHELL ["/bin/bash", "-o", "pipefail", "-c"]

RUN echo "debconf debconf/frontend select Noninteractive" | \
 debconf-set-selections

RUN apt-get update -y -q && \
 apt-get install -y -q \
 build-essential \
 ccache \
 cmake \
 curl \
 git \
 libssl-dev \
 libcurl4-openssl-dev \
 python3-pip \
 tzdata \
 tzdata-legacy \
 wget && \
 apt-get clean && \
 rm -rf /var/lib/apt/lists*

# Installs LLVM toolchain, for Gandiva and testing other compilers
#
# Note that this is installed before the base packages to improve iteration
# while debugging package list with docker build.
ARG llvm
RUN latest_system_llvm=14 && \
 if [ ${llvm} -gt ${latest_system_llvm} ]; then \
 apt-get update -y -q && \
 apt-get install -y -q --no-install-recommends \
 apt-transport-https \
 ca-certificates \
 gnupg \
 lsb-release \
 wget && \
 wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - && \
 code_name=$(lsb_release --codename --short) && \
 if [ ${llvm} -gt 10 ]; then \
 echo "deb https://apt.llvm.org/${code_name}/ llvm-toolchain-${code_name}-${llvm} main" > \
 /etc/apt/sources.list.d/llvm.list; \
 fi; \
 fi && \
 apt-get update -y -q && \
 apt-get install -y -q --no-install-recommends \
 clang-${llvm} \
 llvm-${llvm}-dev && \
 apt-get clean && \
 rm -rf /var/lib/apt/lists*

COPY ci/scripts/install_minio.sh /arrow/ci/scripts/
RUN /arrow/ci/scripts/install_minio.sh latest /usr/local

COPY ci/scripts/install_gcs_testbench.sh /arrow/ci/scripts/
RUN /arrow/ci/scripts/install_gcs_testbench.sh default

COPY ci/scripts/install_sccache.sh /arrow/ci/scripts/
RUN /arrow/ci/scripts/install_sccache.sh unknown-linux-musl /usr/local/bin

ENV ARROW_ACERO=ON \
 ARROW_AZURE=OFF \
 ARROW_BUILD_TESTS=ON \
 ARROW_DATASET=ON \
 ARROW_FLIGHT=ON \
 ARROW_GANDIVA=ON \
 ARROW_GCS=ON \
 ARROW_HDFS=ON \
 ARROW_HOME=/usr/local \
 ARROW_INSTALL_NAME_RPATH=OFF \
 ARROW_ORC=ON \
 ARROW_PARQUET=ON \
 ARROW_S3=ON \
 ARROW_USE_CCACHE=ON \
 ARROW_WITH_BROTLI=ON \
 ARROW_WITH_BZ2=ON \
 ARROW_WITH_LZ4=ON \
 ARROW_WITH_OPENTELEMETRY=OFF \
 ARROW_WITH_SNAPPY=ON \
 ARROW_WITH_ZLIB=ON \
 ARROW_WITH_ZSTD=ON \
 CMAKE_GENERATOR="Unix Makefiles" \
 PARQUET_BUILD_EXAMPLES=ON \
 PARQUET_BUILD_EXECUTABLES=ON \
 PATH=/usr/lib/ccache/:$PATH \
 PYTHON=python3

4 changes: 4 additions & 0 deletions
cpp/cmake_modules/ThirdpartyToolchain.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2882,6 +2882,10 @@ macro(build_absl)
 set(ABSL_INCLUDE_DIR "${ABSL_PREFIX}/include")
 set(ABSL_CMAKE_ARGS "${EP_COMMON_CMAKE_ARGS}" -DABSL_RUN_TESTS=OFF
 "-DCMAKE_INSTALL_PREFIX=${ABSL_PREFIX}")
 if(CMAKE_COMPILER_IS_GNUCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 13.0)
 set(ABSL_CXX_FLAGS "${EP_CXX_FLAGS} -include stdint.h")
 list(APPEND ABSL_CMAKE_ARGS "-DCMAKE_CXX_FLAGS=${ABSL_CXX_FLAGS}")
 endif()
 set(ABSL_BUILD_BYPRODUCTS)
 set(ABSL_LIBRARIES)

Expand Down

9 changes: 9 additions & 0 deletions
dev/tasks/tasks.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1058,6 +1058,15 @@ tasks:
 UBUNTU: 20.04
 image: ubuntu-cpp-bundled

 test-ubuntu-24.04-cpp-gcc-13-bundled:
 ci: github
 template: docker-tests/github.linux.yml
 params:
 env:
 UBUNTU: 24.04
 GCC_VERSION: 13
 image: ubuntu-cpp-bundled

 test-ubuntu-24.04-cpp:
 ci: github
 template: docker-tests/github.linux.yml
Expand Down

14 changes: 0 additions & 14 deletions
r/configure

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -95,20 +95,6 @@ if [ ! "`${R_HOME}/bin/R CMD config CXX17`" ]; then
 exit 1
fi

# GH-36969: The version of Abseil used in the bundled build won't build on
# gcc-13. As a workaround for the 13.0.0 release, explicitly set
# ARROW_WITH_GOOGLE_CLOUD_CPP to OFF (if not already set)
if [ -z "$ARROW_GCS" ]; then
 CXX17=`${R_HOME}/bin/R CMD config CXX17`
 CXX17_VERSION=`$CXX17 --version`
 if echo "$CXX17_VERSION" | grep -e "g++" > /dev/null ; then
 if echo "$CXX17_VERSION" | grep -e "13.[0-9]\+.[0-9]\+" > /dev/null ; then
 echo "*** Disabling Arrow build with GCS on gcc-13."
 echo "*** Set ARROW_GCS=ON to explicitly enable."
 export ARROW_GCS="OFF"
 fi
 fi
fi

# Test if pkg-config is available to use
if ${PKG_CONFIG} --version >/dev/null 2>&1; then
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
GH-43228: [C++] Fix Abseil compile error on GCC 13#43157

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

assignUser
merged 21 commits into

from

Jul 26, 2024
 Merged


GH-43228: [C++] Fix Abseil compile error on GCC 13
#43157
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


21 commits


Select commit
Hold shift + click to select a range
1cba3ce

Include stdint on GCC13


amol- Jul 5, 2024
7a3f0ab

Lint


amol- Jul 5, 2024
ed6ca2f

Update cpp/cmake_modules/ThirdpartyToolchain.cmake


amol- Jul 23, 2024
0fb0f12

Add GCC-13 test environment


amol- Jul 24, 2024
6066c86

Test in CPP env instead of R env


amol- Jul 24, 2024
f6bccb9

Build third party dependencies


amol- Jul 24, 2024
b0185f3

Build only ABSL as bundled


amol- Jul 24, 2024
2a11108

Profobuf must be bundled if absl is bundled


amol- Jul 24, 2024
d707350

ops, typo


amol- Jul 24, 2024
d03855a

Switch to bundled image


amol- Jul 24, 2024
e757478

Add ubuntu 24.04 minimal


amol- Jul 24, 2024
a55a5d8

Temporarily add verbose for debugging


amol- Jul 24, 2024
76c149e

Try to disable ccache temporarily


amol- Jul 24, 2024
0fe54c2

Add verbose third party builds for debugging


amol- Jul 25, 2024
adac2e0

Try to propagate CXX flags


amol- Jul 25, 2024
1b61d03

strip spaces in flags


amol- Jul 25, 2024
d59f39b

Specify CMAKE_ARGS explicitly for ABSL


amol- Jul 25, 2024
70e6e7d

Remove unecessary strip


amol- Jul 25, 2024
1a12ea6

Remove debugging flags


amol- Jul 25, 2024
943baa0

Add tzdata-legacy


amol- Jul 25, 2024
0a6e367

Remove workaround for GCS


amol- Jul 26, 2024

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


104 changes: 104 additions & 0 deletions
ci/docker/ubuntu-24.04-cpp-minimal.dockerfile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, 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.

ARG base=amd64/ubuntu:24.04
FROM ${base}

SHELL ["/bin/bash", "-o", "pipefail", "-c"]

RUN echo "debconf debconf/frontend select Noninteractive" | \
 debconf-set-selections

RUN apt-get update -y -q && \
 apt-get install -y -q \
 build-essential \
 ccache \
 cmake \
 curl \
 git \
 libssl-dev \
 libcurl4-openssl-dev \
 python3-pip \
 tzdata \
 tzdata-legacy \
 wget && \
 apt-get clean && \
 rm -rf /var/lib/apt/lists*

# Installs LLVM toolchain, for Gandiva and testing other compilers
#
# Note that this is installed before the base packages to improve iteration
# while debugging package list with docker build.
ARG llvm
RUN latest_system_llvm=14 && \
 if [ ${llvm} -gt ${latest_system_llvm} ]; then \
 apt-get update -y -q && \
 apt-get install -y -q --no-install-recommends \
 apt-transport-https \
 ca-certificates \
 gnupg \
 lsb-release \
 wget && \
 wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - && \
 code_name=$(lsb_release --codename --short) && \
 if [ ${llvm} -gt 10 ]; then \
 echo "deb https://apt.llvm.org/${code_name}/ llvm-toolchain-${code_name}-${llvm} main" > \
 /etc/apt/sources.list.d/llvm.list; \
 fi; \
 fi && \
 apt-get update -y -q && \
 apt-get install -y -q --no-install-recommends \
 clang-${llvm} \
 llvm-${llvm}-dev && \
 apt-get clean && \
 rm -rf /var/lib/apt/lists*

COPY ci/scripts/install_minio.sh /arrow/ci/scripts/
RUN /arrow/ci/scripts/install_minio.sh latest /usr/local

COPY ci/scripts/install_gcs_testbench.sh /arrow/ci/scripts/
RUN /arrow/ci/scripts/install_gcs_testbench.sh default

COPY ci/scripts/install_sccache.sh /arrow/ci/scripts/
RUN /arrow/ci/scripts/install_sccache.sh unknown-linux-musl /usr/local/bin

ENV ARROW_ACERO=ON \
 ARROW_AZURE=OFF \
 ARROW_BUILD_TESTS=ON \
 ARROW_DATASET=ON \
 ARROW_FLIGHT=ON \
 ARROW_GANDIVA=ON \
 ARROW_GCS=ON \
 ARROW_HDFS=ON \
 ARROW_HOME=/usr/local \
 ARROW_INSTALL_NAME_RPATH=OFF \
 ARROW_ORC=ON \
 ARROW_PARQUET=ON \
 ARROW_S3=ON \
 ARROW_USE_CCACHE=ON \
 ARROW_WITH_BROTLI=ON \
 ARROW_WITH_BZ2=ON \
 ARROW_WITH_LZ4=ON \
 ARROW_WITH_OPENTELEMETRY=OFF \
 ARROW_WITH_SNAPPY=ON \
 ARROW_WITH_ZLIB=ON \
 ARROW_WITH_ZSTD=ON \
 CMAKE_GENERATOR="Unix Makefiles" \
 PARQUET_BUILD_EXAMPLES=ON \
 PARQUET_BUILD_EXECUTABLES=ON \
 PATH=/usr/lib/ccache/:$PATH \
 PYTHON=python3

4 changes: 4 additions & 0 deletions
cpp/cmake_modules/ThirdpartyToolchain.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2882,6 +2882,10 @@ macro(build_absl)
 set(ABSL_INCLUDE_DIR "${ABSL_PREFIX}/include")
 set(ABSL_CMAKE_ARGS "${EP_COMMON_CMAKE_ARGS}" -DABSL_RUN_TESTS=OFF
 "-DCMAKE_INSTALL_PREFIX=${ABSL_PREFIX}")
 if(CMAKE_COMPILER_IS_GNUCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 13.0)
 set(ABSL_CXX_FLAGS "${EP_CXX_FLAGS} -include stdint.h")
 list(APPEND ABSL_CMAKE_ARGS "-DCMAKE_CXX_FLAGS=${ABSL_CXX_FLAGS}")
 endif()
 set(ABSL_BUILD_BYPRODUCTS)
 set(ABSL_LIBRARIES)

Expand Down

9 changes: 9 additions & 0 deletions
dev/tasks/tasks.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1058,6 +1058,15 @@ tasks:
 UBUNTU: 20.04
 image: ubuntu-cpp-bundled

 test-ubuntu-24.04-cpp-gcc-13-bundled:
 ci: github
 template: docker-tests/github.linux.yml
 params:
 env:
 UBUNTU: 24.04
 GCC_VERSION: 13
 image: ubuntu-cpp-bundled

 test-ubuntu-24.04-cpp:
 ci: github
 template: docker-tests/github.linux.yml
Expand Down

14 changes: 0 additions & 14 deletions
r/configure

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -95,20 +95,6 @@ if [ ! "`${R_HOME}/bin/R CMD config CXX17`" ]; then
 exit 1
fi

# GH-36969: The version of Abseil used in the bundled build won't build on
# gcc-13. As a workaround for the 13.0.0 release, explicitly set
# ARROW_WITH_GOOGLE_CLOUD_CPP to OFF (if not already set)
if [ -z "$ARROW_GCS" ]; then
 CXX17=`${R_HOME}/bin/R CMD config CXX17`
 CXX17_VERSION=`$CXX17 --version`
 if echo "$CXX17_VERSION" | grep -e "g++" > /dev/null ; then
 if echo "$CXX17_VERSION" | grep -e "13.[0-9]\+.[0-9]\+" > /dev/null ; then
 echo "*** Disabling Arrow build with GCS on gcc-13."
 echo "*** Set ARROW_GCS=ON to explicitly enable."
 export ARROW_GCS="OFF"
 fi
 fi
fi

# Test if pkg-config is available to use
if ${PKG_CONFIG} --version >/dev/null 2>&1; then
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
GH-43228: [C++] Fix Abseil compile error on GCC 13#43157

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

assignUser
merged 21 commits into

from

Jul 26, 2024
 Merged


GH-43228: [C++] Fix Abseil compile error on GCC 13
#43157
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


21 commits


Select commit
Hold shift + click to select a range
1cba3ce

Include stdint on GCC13


amol- Jul 5, 2024
7a3f0ab

Lint


amol- Jul 5, 2024
ed6ca2f

Update cpp/cmake_modules/ThirdpartyToolchain.cmake


amol- Jul 23, 2024
0fb0f12

Add GCC-13 test environment


amol- Jul 24, 2024
6066c86

Test in CPP env instead of R env


amol- Jul 24, 2024
f6bccb9

Build third party dependencies


amol- Jul 24, 2024
b0185f3

Build only ABSL as bundled


amol- Jul 24, 2024
2a11108

Profobuf must be bundled if absl is bundled


amol- Jul 24, 2024
d707350

ops, typo


amol- Jul 24, 2024
d03855a

Switch to bundled image


amol- Jul 24, 2024
e757478

Add ubuntu 24.04 minimal


amol- Jul 24, 2024
a55a5d8

Temporarily add verbose for debugging


amol- Jul 24, 2024
76c149e

Try to disable ccache temporarily


amol- Jul 24, 2024
0fe54c2

Add verbose third party builds for debugging


amol- Jul 25, 2024
adac2e0

Try to propagate CXX flags


amol- Jul 25, 2024
1b61d03

strip spaces in flags


amol- Jul 25, 2024
d59f39b

Specify CMAKE_ARGS explicitly for ABSL


amol- Jul 25, 2024
70e6e7d

Remove unecessary strip


amol- Jul 25, 2024
1a12ea6

Remove debugging flags


amol- Jul 25, 2024
943baa0

Add tzdata-legacy


amol- Jul 25, 2024
0a6e367

Remove workaround for GCS


amol- Jul 26, 2024

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


104 changes: 104 additions & 0 deletions
ci/docker/ubuntu-24.04-cpp-minimal.dockerfile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, 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.

ARG base=amd64/ubuntu:24.04
FROM ${base}

SHELL ["/bin/bash", "-o", "pipefail", "-c"]

RUN echo "debconf debconf/frontend select Noninteractive" | \
 debconf-set-selections

RUN apt-get update -y -q && \
 apt-get install -y -q \
 build-essential \
 ccache \
 cmake \
 curl \
 git \
 libssl-dev \
 libcurl4-openssl-dev \
 python3-pip \
 tzdata \
 tzdata-legacy \
 wget && \
 apt-get clean && \
 rm -rf /var/lib/apt/lists*

# Installs LLVM toolchain, for Gandiva and testing other compilers
#
# Note that this is installed before the base packages to improve iteration
# while debugging package list with docker build.
ARG llvm
RUN latest_system_llvm=14 && \
 if [ ${llvm} -gt ${latest_system_llvm} ]; then \
 apt-get update -y -q && \
 apt-get install -y -q --no-install-recommends \
 apt-transport-https \
 ca-certificates \
 gnupg \
 lsb-release \
 wget && \
 wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - && \
 code_name=$(lsb_release --codename --short) && \
 if [ ${llvm} -gt 10 ]; then \
 echo "deb https://apt.llvm.org/${code_name}/ llvm-toolchain-${code_name}-${llvm} main" > \
 /etc/apt/sources.list.d/llvm.list; \
 fi; \
 fi && \
 apt-get update -y -q && \
 apt-get install -y -q --no-install-recommends \
 clang-${llvm} \
 llvm-${llvm}-dev && \
 apt-get clean && \
 rm -rf /var/lib/apt/lists*

COPY ci/scripts/install_minio.sh /arrow/ci/scripts/
RUN /arrow/ci/scripts/install_minio.sh latest /usr/local

COPY ci/scripts/install_gcs_testbench.sh /arrow/ci/scripts/
RUN /arrow/ci/scripts/install_gcs_testbench.sh default

COPY ci/scripts/install_sccache.sh /arrow/ci/scripts/
RUN /arrow/ci/scripts/install_sccache.sh unknown-linux-musl /usr/local/bin

ENV ARROW_ACERO=ON \
 ARROW_AZURE=OFF \
 ARROW_BUILD_TESTS=ON \
 ARROW_DATASET=ON \
 ARROW_FLIGHT=ON \
 ARROW_GANDIVA=ON \
 ARROW_GCS=ON \
 ARROW_HDFS=ON \
 ARROW_HOME=/usr/local \
 ARROW_INSTALL_NAME_RPATH=OFF \
 ARROW_ORC=ON \
 ARROW_PARQUET=ON \
 ARROW_S3=ON \
 ARROW_USE_CCACHE=ON \
 ARROW_WITH_BROTLI=ON \
 ARROW_WITH_BZ2=ON \
 ARROW_WITH_LZ4=ON \
 ARROW_WITH_OPENTELEMETRY=OFF \
 ARROW_WITH_SNAPPY=ON \
 ARROW_WITH_ZLIB=ON \
 ARROW_WITH_ZSTD=ON \
 CMAKE_GENERATOR="Unix Makefiles" \
 PARQUET_BUILD_EXAMPLES=ON \
 PARQUET_BUILD_EXECUTABLES=ON \
 PATH=/usr/lib/ccache/:$PATH \
 PYTHON=python3

4 changes: 4 additions & 0 deletions
cpp/cmake_modules/ThirdpartyToolchain.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2882,6 +2882,10 @@ macro(build_absl)
 set(ABSL_INCLUDE_DIR "${ABSL_PREFIX}/include")
 set(ABSL_CMAKE_ARGS "${EP_COMMON_CMAKE_ARGS}" -DABSL_RUN_TESTS=OFF
 "-DCMAKE_INSTALL_PREFIX=${ABSL_PREFIX}")
 if(CMAKE_COMPILER_IS_GNUCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 13.0)
 set(ABSL_CXX_FLAGS "${EP_CXX_FLAGS} -include stdint.h")
 list(APPEND ABSL_CMAKE_ARGS "-DCMAKE_CXX_FLAGS=${ABSL_CXX_FLAGS}")
 endif()
 set(ABSL_BUILD_BYPRODUCTS)
 set(ABSL_LIBRARIES)

Expand Down

9 changes: 9 additions & 0 deletions
dev/tasks/tasks.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1058,6 +1058,15 @@ tasks:
 UBUNTU: 20.04
 image: ubuntu-cpp-bundled

 test-ubuntu-24.04-cpp-gcc-13-bundled:
 ci: github
 template: docker-tests/github.linux.yml
 params:
 env:
 UBUNTU: 24.04
 GCC_VERSION: 13
 image: ubuntu-cpp-bundled

 test-ubuntu-24.04-cpp:
 ci: github
 template: docker-tests/github.linux.yml
Expand Down

14 changes: 0 additions & 14 deletions
r/configure

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -95,20 +95,6 @@ if [ ! "`${R_HOME}/bin/R CMD config CXX17`" ]; then
 exit 1
fi

# GH-36969: The version of Abseil used in the bundled build won't build on
# gcc-13. As a workaround for the 13.0.0 release, explicitly set
# ARROW_WITH_GOOGLE_CLOUD_CPP to OFF (if not already set)
if [ -z "$ARROW_GCS" ]; then
 CXX17=`${R_HOME}/bin/R CMD config CXX17`
 CXX17_VERSION=`$CXX17 --version`
 if echo "$CXX17_VERSION" | grep -e "g++" > /dev/null ; then
 if echo "$CXX17_VERSION" | grep -e "13.[0-9]\+.[0-9]\+" > /dev/null ; then
 echo "*** Disabling Arrow build with GCS on gcc-13."
 echo "*** Set ARROW_GCS=ON to explicitly enable."
 export ARROW_GCS="OFF"
 fi
 fi
fi

# Test if pkg-config is available to use
if ${PKG_CONFIG} --version >/dev/null 2>&1; then
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
GH-43228: [C++] Fix Abseil compile error on GCC 13#43157

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

assignUser
merged 21 commits into

from

Jul 26, 2024
 Merged


GH-43228: [C++] Fix Abseil compile error on GCC 13
#43157
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


21 commits


Select commit
Hold shift + click to select a range
1cba3ce

Include stdint on GCC13


amol- Jul 5, 2024
7a3f0ab

Lint


amol- Jul 5, 2024
ed6ca2f

Update cpp/cmake_modules/ThirdpartyToolchain.cmake


amol- Jul 23, 2024
0fb0f12

Add GCC-13 test environment


amol- Jul 24, 2024
6066c86

Test in CPP env instead of R env


amol- Jul 24, 2024
f6bccb9

Build third party dependencies


amol- Jul 24, 2024
b0185f3

Build only ABSL as bundled


amol- Jul 24, 2024
2a11108

Profobuf must be bundled if absl is bundled


amol- Jul 24, 2024
d707350

ops, typo


amol- Jul 24, 2024
d03855a

Switch to bundled image


amol- Jul 24, 2024
e757478

Add ubuntu 24.04 minimal


amol- Jul 24, 2024
a55a5d8

Temporarily add verbose for debugging


amol- Jul 24, 2024
76c149e

Try to disable ccache temporarily


amol- Jul 24, 2024
0fe54c2

Add verbose third party builds for debugging


amol- Jul 25, 2024
adac2e0

Try to propagate CXX flags


amol- Jul 25, 2024
1b61d03

strip spaces in flags


amol- Jul 25, 2024
d59f39b

Specify CMAKE_ARGS explicitly for ABSL


amol- Jul 25, 2024
70e6e7d

Remove unecessary strip


amol- Jul 25, 2024
1a12ea6

Remove debugging flags


amol- Jul 25, 2024
943baa0

Add tzdata-legacy


amol- Jul 25, 2024
0a6e367

Remove workaround for GCS


amol- Jul 26, 2024

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


104 changes: 104 additions & 0 deletions
ci/docker/ubuntu-24.04-cpp-minimal.dockerfile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, 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.

ARG base=amd64/ubuntu:24.04
FROM ${base}

SHELL ["/bin/bash", "-o", "pipefail", "-c"]

RUN echo "debconf debconf/frontend select Noninteractive" | \
 debconf-set-selections

RUN apt-get update -y -q && \
 apt-get install -y -q \
 build-essential \
 ccache \
 cmake \
 curl \
 git \
 libssl-dev \
 libcurl4-openssl-dev \
 python3-pip \
 tzdata \
 tzdata-legacy \
 wget && \
 apt-get clean && \
 rm -rf /var/lib/apt/lists*

# Installs LLVM toolchain, for Gandiva and testing other compilers
#
# Note that this is installed before the base packages to improve iteration
# while debugging package list with docker build.
ARG llvm
RUN latest_system_llvm=14 && \
 if [ ${llvm} -gt ${latest_system_llvm} ]; then \
 apt-get update -y -q && \
 apt-get install -y -q --no-install-recommends \
 apt-transport-https \
 ca-certificates \
 gnupg \
 lsb-release \
 wget && \
 wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - && \
 code_name=$(lsb_release --codename --short) && \
 if [ ${llvm} -gt 10 ]; then \
 echo "deb https://apt.llvm.org/${code_name}/ llvm-toolchain-${code_name}-${llvm} main" > \
 /etc/apt/sources.list.d/llvm.list; \
 fi; \
 fi && \
 apt-get update -y -q && \
 apt-get install -y -q --no-install-recommends \
 clang-${llvm} \
 llvm-${llvm}-dev && \
 apt-get clean && \
 rm -rf /var/lib/apt/lists*

COPY ci/scripts/install_minio.sh /arrow/ci/scripts/
RUN /arrow/ci/scripts/install_minio.sh latest /usr/local

COPY ci/scripts/install_gcs_testbench.sh /arrow/ci/scripts/
RUN /arrow/ci/scripts/install_gcs_testbench.sh default

COPY ci/scripts/install_sccache.sh /arrow/ci/scripts/
RUN /arrow/ci/scripts/install_sccache.sh unknown-linux-musl /usr/local/bin

ENV ARROW_ACERO=ON \
 ARROW_AZURE=OFF \
 ARROW_BUILD_TESTS=ON \
 ARROW_DATASET=ON \
 ARROW_FLIGHT=ON \
 ARROW_GANDIVA=ON \
 ARROW_GCS=ON \
 ARROW_HDFS=ON \
 ARROW_HOME=/usr/local \
 ARROW_INSTALL_NAME_RPATH=OFF \
 ARROW_ORC=ON \
 ARROW_PARQUET=ON \
 ARROW_S3=ON \
 ARROW_USE_CCACHE=ON \
 ARROW_WITH_BROTLI=ON \
 ARROW_WITH_BZ2=ON \
 ARROW_WITH_LZ4=ON \
 ARROW_WITH_OPENTELEMETRY=OFF \
 ARROW_WITH_SNAPPY=ON \
 ARROW_WITH_ZLIB=ON \
 ARROW_WITH_ZSTD=ON \
 CMAKE_GENERATOR="Unix Makefiles" \
 PARQUET_BUILD_EXAMPLES=ON \
 PARQUET_BUILD_EXECUTABLES=ON \
 PATH=/usr/lib/ccache/:$PATH \
 PYTHON=python3

4 changes: 4 additions & 0 deletions
cpp/cmake_modules/ThirdpartyToolchain.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2882,6 +2882,10 @@ macro(build_absl)
 set(ABSL_INCLUDE_DIR "${ABSL_PREFIX}/include")
 set(ABSL_CMAKE_ARGS "${EP_COMMON_CMAKE_ARGS}" -DABSL_RUN_TESTS=OFF
 "-DCMAKE_INSTALL_PREFIX=${ABSL_PREFIX}")
 if(CMAKE_COMPILER_IS_GNUCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 13.0)
 set(ABSL_CXX_FLAGS "${EP_CXX_FLAGS} -include stdint.h")
 list(APPEND ABSL_CMAKE_ARGS "-DCMAKE_CXX_FLAGS=${ABSL_CXX_FLAGS}")
 endif()
 set(ABSL_BUILD_BYPRODUCTS)
 set(ABSL_LIBRARIES)

Expand Down

9 changes: 9 additions & 0 deletions
dev/tasks/tasks.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1058,6 +1058,15 @@ tasks:
 UBUNTU: 20.04
 image: ubuntu-cpp-bundled

 test-ubuntu-24.04-cpp-gcc-13-bundled:
 ci: github
 template: docker-tests/github.linux.yml
 params:
 env:
 UBUNTU: 24.04
 GCC_VERSION: 13
 image: ubuntu-cpp-bundled

 test-ubuntu-24.04-cpp:
 ci: github
 template: docker-tests/github.linux.yml
Expand Down

14 changes: 0 additions & 14 deletions
r/configure

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -95,20 +95,6 @@ if [ ! "`${R_HOME}/bin/R CMD config CXX17`" ]; then
 exit 1
fi

# GH-36969: The version of Abseil used in the bundled build won't build on
# gcc-13. As a workaround for the 13.0.0 release, explicitly set
# ARROW_WITH_GOOGLE_CLOUD_CPP to OFF (if not already set)
if [ -z "$ARROW_GCS" ]; then
 CXX17=`${R_HOME}/bin/R CMD config CXX17`
 CXX17_VERSION=`$CXX17 --version`
 if echo "$CXX17_VERSION" | grep -e "g++" > /dev/null ; then
 if echo "$CXX17_VERSION" | grep -e "13.[0-9]\+.[0-9]\+" > /dev/null ; then
 echo "*** Disabling Arrow build with GCS on gcc-13."
 echo "*** Set ARROW_GCS=ON to explicitly enable."
 export ARROW_GCS="OFF"
 fi
 fi
fi

# Test if pkg-config is available to use
if ${PKG_CONFIG} --version >/dev/null 2>&1; then
Expand Down