Skip to content

Commit 775956f

Browse files
stevelorddremioPaul Nienaber
authored andcommitted
DX-90582: Initial patch fork from dremio#4 (DX-59038)
Wasn't building so moving forward from here. (This was the commit being used by the release job prior to DX-90582. +Patched out vcpkg.json builtin-baseline in an attempt to work around vcpkg & VS2022 incompatibility, as detailed from roughly microsoft/vcpkg#22074 (comment) onward. Overall it appears the issue is an out-of-date vcpkg binary, which by design cannot be updated (notwithstanding the linked comment...) without updating vcpkg package repo and therefore all dependency packages--so we are proceeding with that and hopefully Warpdrive builds with updated vcpkg packages. Change-Id: Ic7289452f69f046dcb8ccab3dbc4b31e90b9e1ab
1 parent 642a803 commit 775956f

File tree

9 files changed

+11
-12
lines changed

9 files changed

+11
-12
lines changed

Brewfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ brew "boost"
88
brew "cmake"
99
brew "git"
1010
brew "glog"
11+
brew "libiodbc@3.52.15"
1112
brew "ninja"
1213
brew "openssl@1.1"
1314
brew "wget"
14-
brew "libiodbc@3.52.15"

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff 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()
578578
endif()
579579

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff 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

3636
RUN 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

build-debug.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ cd _build
2828
ARROW_GIT_REPOSITORY="${ARROW_GIT_REPOSITORY:=https://github.com/apache/arrow}"
2929
ARROW_GIT_TAG="${ARROW_GIT_TAG:=b050bd0d31db6412256cec3362c0d57c9732e1f2}"
3030
ODBCABSTRACTION_REPO="${ODBCABSTRACTION_REPO:=/opt/flightsql-odbc}"
31-
ODBCABSTRACTION_GIT_TAG="${ODBCABSTRACTION_GIT_TAG:=156ac3d10703c00308ff707134d65b20dd362281}"
31+
ODBCABSTRACTION_GIT_TAG="${ODBCABSTRACTION_GIT_TAG:=d2a1029b0641febb0872831bec1b90fe3f635dd3}"
3232

3333
cmake \
3434
-GNinja \

build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ cd _build
1515
ARROW_GIT_REPOSITORY="${ARROW_GIT_REPOSITORY:=https://github.com/apache/arrow}"
1616
ARROW_GIT_TAG="${ARROW_GIT_TAG:=b050bd0d31db6412256cec3362c0d57c9732e1f2}"
1717
ODBCABSTRACTION_REPO="${ODBCABSTRACTION_REPO:=/opt/flightsql-odbc}"
18-
ODBCABSTRACTION_GIT_TAG="${ODBCABSTRACTION_GIT_TAG:=156ac3d10703c00308ff707134d65b20dd362281}"
18+
ODBCABSTRACTION_GIT_TAG="${ODBCABSTRACTION_GIT_TAG:=d2a1029b0641febb0872831bec1b90fe3f635dd3}"
1919

2020
cmake \
2121
-GNinja \

build_osx.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ cd build
1717
ARROW_GIT_REPOSITORY="${ARROW_GIT_REPOSITORY:=https://github.com/apache/arrow}"
1818
ARROW_GIT_TAG="${ARROW_GIT_TAG:=b050bd0d31db6412256cec3362c0d57c9732e1f2}"
1919
ODBCABSTRACTION_REPO="${ODBCABSTRACTION_REPO:=../flightsql-odbc}"
20-
ODBCABSTRACTION_GIT_TAG="${ODBCABSTRACTION_GIT_TAG:=156ac3d10703c00308ff707134d65b20dd362281}"
20+
ODBCABSTRACTION_GIT_TAG="${ODBCABSTRACTION_GIT_TAG:=d2a1029b0641febb0872831bec1b90fe3f635dd3}"
2121

2222
cmake \
2323
-DCMAKE_BUILD_TYPE=Release \

build_win32.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ SETLOCAL
2222
if NOT DEFINED ARROW_GIT_REPOSITORY SET ARROW_GIT_REPOSITORY="https://github.com/apache/arrow"
2323
if NOT DEFINED ARROW_GIT_TAG SET ARROW_GIT_TAG="b050bd0d31db6412256cec3362c0d57c9732e1f2"
2424
if 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

2727
cmake ..^
2828
-DARROW_GIT_REPOSITORY=%ARROW_GIT_REPOSITORY%^

build_win64.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ SETLOCAL
2222
if NOT DEFINED ARROW_GIT_REPOSITORY SET ARROW_GIT_REPOSITORY="https://github.com/apache/arrow"
2323
if NOT DEFINED ARROW_GIT_TAG SET ARROW_GIT_TAG="b050bd0d31db6412256cec3362c0d57c9732e1f2"
2424
if 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

2727
cmake ..^
2828
-DARROW_GIT_REPOSITORY=%ARROW_GIT_REPOSITORY%^

vcpkg.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,5 @@
2525
"utf8proc",
2626
"zlib",
2727
"zstd"
28-
],
29-
"builtin-baseline": "4e485c34f5e056327ef00c14e2e3620bc50de098"
28+
]
3029
}

0 commit comments

Comments
 (0)