Skip to content

MDBF-934: Update AIX to later supported version #843

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

Open
wants to merge 3 commits into
base: dev
Choose a base branch
from
Open

MDBF-934: Update AIX to later supported version #843

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1713be5
ccache not available from dnf
fauust Sep 15, 2025
fee60cf
Apply @grooverdan's patch
fauust Sep 15, 2025
bdfc4a4
Rename the worker
fauust Sep 17, 2025
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 constants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@
"amd64-ubuntu-2404-clang18-asan",
"amd64-windows",
"amd64-windows-packages",
"ppc64be-aix-71",
"ppc64be-aix-73",
"ppc64le-centos-stream9",
"ppc64le-rhel-8",
"ppc64le-rhel-9",
Expand Down
2 changes: 1 addition & 1 deletion master-nonlatent/master.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1051,7 +1051,7 @@ c["builders"].append(

c["builders"].append(
util.BuilderConfig(
name="ppc64be-aix-71",
name="ppc64be-aix-73",
workernames=["aix-worker"],
tags=["AIX 7.1", "quick", "gcc", "experimental"],
collapseRequests=True,
Expand Down
19 changes: 10 additions & 9 deletions scripts/aix-build-and-test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ build_deps() {
# manually remove install directory when changeing version
# v=9.1.0,9.0.0,8.1.1 - fails to build
# Currently unreleased - manual build as of b817610
v=10.2.2
v=11.0.2
wget https://github.com/fmtlib/fmt/archive/refs/tags/${v}.tar.gz -O - | tar -zxf -
rm -rf build-fmt
mkdir -p build-fmt
cd build-fmt
cmake -DCMAKE_CXX_COMPILER=g++-11 -DCMAKE_COMPILER_IS_GNUCXX=0 \
cmake -DCMAKE_CXX_COMPILER=g++ -DCMAKE_COMPILER_IS_GNUCXX=0 \
-DCMAKE_INSTALL_PREFIX="$HOME"/inst-fmt \
-DFMT_DOC=OFF -DFMT_TEST=OFF \
../fmt-$v/
Expand All @@ -29,27 +29,28 @@ build() {
source=$1
mkdir -p build
cd build
/opt/bin/ccache --zero-stats
/opt/freeware/bin/ccache-swig -z
cmake ../"$source" -DCMAKE_BUILD_TYPE="$2" \
-DCMAKE_C_LAUNCHER=/opt/bin/ccache \
-DCMAKE_CXX_LAUNCHER=/opt/bin/ccache \
-DCMAKE_C_COMPILER=gcc-11 \
-DCMAKE_CXX_COMPILER=g++-11 \
-DCMAKE_C_LAUNCHER=/opt/freeware/bin/ccache-swig \
-DCMAKE_CXX_LAUNCHER=/opt/freeware/bin/ccache-swig \
-DCMAKE_C_COMPILER=gcc \
-DCMAKE_CXX_COMPILER=g++ \
-DCMAKE_AR=/usr/bin/ar \
-DCMAKE_PREFIX_PATH=/opt/freeware/ \
-DCMAKE_REQUIRED_FLAGS=-I\ /opt/freeware/include \
-DPLUGIN_OQGRAPH=NO \
-DWITH_UNIT_TESTS=NO \
-DPLUGIN_S3=NO \
-DPLUGIN_CONNECT=NO \
-DPLUGIN_PERFSCHEMA=NO \
-DPLUGIN_SPIDER=NO \
-DPLUGIN_WSREP_INFO=NO \
-DLIBFMT_INCLUDE_DIR="$HOME"/inst-fmt/include \
-DCMAKE_LIBRARY_PATH="$HOME"/inst-fmt/lib \
-Dhave_C__Wl___as_needed= \
-DPLUGIN_AUTH_GSSAPI=NO -DPLUGIN_TYPE_MYSQL_JSON=NO
make -j"$(("$jobs" * 2))"
/opt/bin/ccache --show-stats
/opt/freeware/bin/ccache-swig -s
}

mariadbtest() {
Expand Down Expand Up @@ -104,7 +105,7 @@ clean() {

export TMPDIR="$HOME/tmp"
# gcc-10 paths found by looking at nm /opt/freeware/.../libstdc++.a | grep {missing symbol}
export LIBPATH=/opt/freeware/lib/gcc/powerpc-ibm-aix7.1.0.0/11/pthread/:/opt/freeware/lib/gcc/powerpc-ibm-aix7.1.0.0/11:/usr/lib:"$PWD/build/libmariadb/libmariadb/"
# export LIBPATH=/opt/freeware/lib/gcc/powerpc-ibm-aix7.1.0.0/11/pthread/:/opt/freeware/lib/gcc/powerpc-ibm-aix7.1.0.0/11:/usr/lib:"$PWD/build/libmariadb/libmariadb/"

jobs=${4:-12}

Expand Down