File tree Expand file tree Collapse file tree 9 files changed +11
-12
lines changed
Expand file tree Collapse file tree 9 files changed +11
-12
lines changed Original file line number Diff line number Diff line change @@ -8,7 +8,7 @@ brew "boost"
88brew "cmake"
99brew "git"
1010brew "glog"
11+ brew "libiodbc@3.52.15"
1112brew "ninja"
1213brew "openssl@1.1"
1314brew "wget"
14- brew "libiodbc@3.52.15"
Original file line number Diff line number Diff line change @@ -573,7 +573,7 @@ if (NOT ODBCABSTRACTION_GIT_TAG)
573573 if (DEFINED ENV{ODBCABSTRACTION_GIT_TAG})
574574 set(ODBCABSTRACTION_GIT_TAG " $ENV{ODBCABSTRACTION_GIT_TAG} ")
575575 else()
576- set(ODBCABSTRACTION_GIT_TAG " 156ac3d10703c00308ff707134d65b20dd362281 ")
576+ set(ODBCABSTRACTION_GIT_TAG " d2a1029b0641febb0872831bec1b90fe3f635dd3 ")
577577 endif()
578578endif()
579579
Original file line number Diff line number Diff line change @@ -34,9 +34,9 @@ RUN rm /usr/local/lib/libssl.a /usr/local/lib/libcrypto.a && \
3434 ln -s /usr/lib64/libcrypto.a /usr/local/lib/libcrypto.a
3535
3636RUN yum install -y wget && \
37- wget https://boostorg.jfrog.io/artifactory/main/release/1.76 .0/source/boost_1_76_0 .tar.gz && \
38- tar -xzf boost_1_76_0 .tar.gz && \
39- cd boost_1_76_0 && \
37+ wget https://boostorg.jfrog.io/artifactory/main/release/1.80 .0/source/boost_1_80_0 .tar.gz && \
38+ tar -xzf boost_1_80_0 .tar.gz && \
39+ cd boost_1_80_0 && \
4040 ./bootstrap.sh --prefix=/opt/boost && \
4141 ./b2 install --prefix=/opt/boost --with=all || true
4242
Original file line number Diff line number Diff line change @@ -28,7 +28,7 @@ cd _build
2828ARROW_GIT_REPOSITORY=" ${ARROW_GIT_REPOSITORY:= https:// github.com/ apache/ arrow} "
2929ARROW_GIT_TAG=" ${ARROW_GIT_TAG:= b050bd0d31db6412256cec3362c0d57c9732e1f2} "
3030ODBCABSTRACTION_REPO=" ${ODBCABSTRACTION_REPO:=/ opt/ flightsql-odbc} "
31- ODBCABSTRACTION_GIT_TAG=" ${ODBCABSTRACTION_GIT_TAG:= 156ac3d10703c00308ff707134d65b20dd362281 } "
31+ ODBCABSTRACTION_GIT_TAG=" ${ODBCABSTRACTION_GIT_TAG:= d2a1029b0641febb0872831bec1b90fe3f635dd3 } "
3232
3333cmake \
3434 -GNinja \
Original file line number Diff line number Diff line change @@ -15,7 +15,7 @@ cd _build
1515ARROW_GIT_REPOSITORY=" ${ARROW_GIT_REPOSITORY:= https:// github.com/ apache/ arrow} "
1616ARROW_GIT_TAG=" ${ARROW_GIT_TAG:= b050bd0d31db6412256cec3362c0d57c9732e1f2} "
1717ODBCABSTRACTION_REPO=" ${ODBCABSTRACTION_REPO:=/ opt/ flightsql-odbc} "
18- ODBCABSTRACTION_GIT_TAG=" ${ODBCABSTRACTION_GIT_TAG:= 156ac3d10703c00308ff707134d65b20dd362281 } "
18+ ODBCABSTRACTION_GIT_TAG=" ${ODBCABSTRACTION_GIT_TAG:= d2a1029b0641febb0872831bec1b90fe3f635dd3 } "
1919
2020cmake \
2121 -GNinja \
Original file line number Diff line number Diff line change @@ -17,7 +17,7 @@ cd build
1717ARROW_GIT_REPOSITORY=" ${ARROW_GIT_REPOSITORY:= https:// github.com/ apache/ arrow} "
1818ARROW_GIT_TAG=" ${ARROW_GIT_TAG:= b050bd0d31db6412256cec3362c0d57c9732e1f2} "
1919ODBCABSTRACTION_REPO=" ${ODBCABSTRACTION_REPO:= ../ flightsql-odbc} "
20- ODBCABSTRACTION_GIT_TAG=" ${ODBCABSTRACTION_GIT_TAG:= 156ac3d10703c00308ff707134d65b20dd362281 } "
20+ ODBCABSTRACTION_GIT_TAG=" ${ODBCABSTRACTION_GIT_TAG:= d2a1029b0641febb0872831bec1b90fe3f635dd3 } "
2121
2222cmake \
2323 -DCMAKE_BUILD_TYPE=Release \
Original file line number Diff line number Diff line change @@ -22,7 +22,7 @@ SETLOCAL
2222if NOT DEFINED ARROW_GIT_REPOSITORY SET ARROW_GIT_REPOSITORY = " https://github.com/apache/arrow"
2323if NOT DEFINED ARROW_GIT_TAG SET ARROW_GIT_TAG = " b050bd0d31db6412256cec3362c0d57c9732e1f2"
2424if NOT DEFINED ODBCABSTRACTION_REPO SET ODBCABSTRACTION_REPO = " ../flightsql-odbc"
25- if NOT DEFINED ODBCABSTRACTION_GIT_TAG SET ODBCABSTRACTION_GIT_TAG = " 156ac3d10703c00308ff707134d65b20dd362281 "
25+ if NOT DEFINED ODBCABSTRACTION_GIT_TAG SET ODBCABSTRACTION_GIT_TAG = " d2a1029b0641febb0872831bec1b90fe3f635dd3 "
2626
2727cmake ..^
2828 -DARROW_GIT_REPOSITORY=%ARROW_GIT_REPOSITORY% ^
Original file line number Diff line number Diff line change @@ -22,7 +22,7 @@ SETLOCAL
2222if NOT DEFINED ARROW_GIT_REPOSITORY SET ARROW_GIT_REPOSITORY = " https://github.com/apache/arrow"
2323if NOT DEFINED ARROW_GIT_TAG SET ARROW_GIT_TAG = " b050bd0d31db6412256cec3362c0d57c9732e1f2"
2424if NOT DEFINED ODBCABSTRACTION_REPO SET ODBCABSTRACTION_REPO = " ../flightsql-odbc"
25- if NOT DEFINED ODBCABSTRACTION_GIT_TAG SET ODBCABSTRACTION_GIT_TAG = " 156ac3d10703c00308ff707134d65b20dd362281 "
25+ if NOT DEFINED ODBCABSTRACTION_GIT_TAG SET ODBCABSTRACTION_GIT_TAG = " d2a1029b0641febb0872831bec1b90fe3f635dd3 "
2626
2727cmake ..^
2828 -DARROW_GIT_REPOSITORY=%ARROW_GIT_REPOSITORY% ^
Original file line number Diff line number Diff line change 2525 " utf8proc" ,
2626 " zlib" ,
2727 " zstd"
28- ],
29- "builtin-baseline" : " 4e485c34f5e056327ef00c14e2e3620bc50de098"
28+ ]
3029}
You can’t perform that action at this time.
0 commit comments