Skip to content

Commit fee60cf

Browse files
committed
Apply @grooverdan's patch
1 parent 1713be5 commit fee60cf

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

scripts/aix-build-and-test.sh

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ build_deps() {
77
# manually remove install directory when changeing version
88
# v=9.1.0,9.0.0,8.1.1 - fails to build
99
# Currently unreleased - manual build as of b817610
10-
v=10.2.2
10+
v=11.0.2
1111
wget https://github.com/fmtlib/fmt/archive/refs/tags/${v}.tar.gz -O - | tar -zxf -
1212
rm -rf build-fmt
1313
mkdir -p build-fmt
1414
cd build-fmt
15-
cmake -DCMAKE_CXX_COMPILER=g++-11 -DCMAKE_COMPILER_IS_GNUCXX=0 \
15+
cmake -DCMAKE_CXX_COMPILER=g++ -DCMAKE_COMPILER_IS_GNUCXX=0 \
1616
-DCMAKE_INSTALL_PREFIX="$HOME"/inst-fmt \
1717
-DFMT_DOC=OFF -DFMT_TEST=OFF \
1818
../fmt-$v/
@@ -33,15 +33,16 @@ build() {
3333
cmake ../"$source" -DCMAKE_BUILD_TYPE="$2" \
3434
-DCMAKE_C_LAUNCHER=/opt/freeware/bin/ccache-swig \
3535
-DCMAKE_CXX_LAUNCHER=/opt/freeware/bin/ccache-swig \
36-
-DCMAKE_C_COMPILER=gcc-11 \
37-
-DCMAKE_CXX_COMPILER=g++-11 \
36+
-DCMAKE_C_COMPILER=gcc \
37+
-DCMAKE_CXX_COMPILER=g++ \
3838
-DCMAKE_AR=/usr/bin/ar \
3939
-DCMAKE_PREFIX_PATH=/opt/freeware/ \
4040
-DCMAKE_REQUIRED_FLAGS=-I\ /opt/freeware/include \
4141
-DPLUGIN_OQGRAPH=NO \
4242
-DWITH_UNIT_TESTS=NO \
4343
-DPLUGIN_S3=NO \
4444
-DPLUGIN_CONNECT=NO \
45+
-DPLUGIN_PERFSCHEMA=NO \
4546
-DPLUGIN_SPIDER=NO \
4647
-DPLUGIN_WSREP_INFO=NO \
4748
-DLIBFMT_INCLUDE_DIR="$HOME"/inst-fmt/include \
@@ -104,7 +105,7 @@ clean() {
104105

105106
export TMPDIR="$HOME/tmp"
106107
# gcc-10 paths found by looking at nm /opt/freeware/.../libstdc++.a | grep {missing symbol}
107-
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/"
108+
# 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/"
108109

109110
jobs=${4:-12}
110111

0 commit comments

Comments
 (0)