Skip to content
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

Jump to bottom

Upgrade vcpkg dependencies for the missed boost-format dependency #427

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

Upgrade vcpkg dependencies for the missed boost-format dependency #427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
851d5d6
Upgrade vcpkg dependencies for the missed boost-format dependency
BewareMyPower Jun 11, 2024
049db2e
Adopt the latest semantics of Boost.property_tree
BewareMyPower Jun 12, 2024
5ebd34b
Update Boost download URLs
BewareMyPower Jun 13, 2024
ff1e10a
Fix RPM build
BewareMyPower Jun 13, 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
6 changes: 3 additions & 3 deletions dependencies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@
#

# Note: GCC 4.8 is incompatible with Boost >= 1.84 for the missed std::align
boost: 1.83.0
boost: 1.85.0
cmake: 3.28.3
protobuf: 3.20.0
zlib: 1.3.1
zstd: 1.5.5
zstd: 1.5.6
snappy: 1.1.10
openssl: 1.1.1w
curl: 8.6.0
curl: 8.8.0
3 changes: 0 additions & 3 deletions lib/HTTPLookupService.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,9 +415,6 @@ void HTTPLookupService::handleGetSchemaHTTPRequest(GetSchemaPromise promise, con
ptree::write_json(valueStream, kvRoot.get_child("value"), false);
auto keyData = keyStream.str();
auto valueData = valueStream.str();
// Remove the last line break.
keyData.pop_back();
valueData.pop_back();
schemaData = mergeKeyValueSchema(keyData, valueData);
}

Expand Down
4 changes: 1 addition & 3 deletions lib/Schema.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,9 +172,7 @@ SchemaInfo::SchemaInfo(const SchemaInfo &keySchema, const SchemaInfo &valueSchem
}
std::ostringstream buf;
write_json(buf, pt, false);
auto s = buf.str();
s.pop_back();
return s;
return buf.str();
};

StringMap properties;
Expand Down
6 changes: 3 additions & 3 deletions pkg/apk/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,12 @@ ADD .build/dep-version.py /usr/local/bin

# Download and compile boost
RUN BOOST_VERSION=$(dep-version.py boost) && \
curl -O -L https://github.com/boostorg/boost/releases/download/boost-${BOOST_VERSION}/boost-${BOOST_VERSION}.tar.gz && \
tar zxf boost-${BOOST_VERSION}.tar.gz && \
curl -O -L https://github.com/boostorg/boost/releases/download/boost-${BOOST_VERSION}/boost-${BOOST_VERSION}-b2-nodocs.tar.gz && \
tar zxf boost-${BOOST_VERSION}-b2-nodocs.tar.gz && \
cd boost-${BOOST_VERSION} && \
./bootstrap.sh --with-libraries=regex && \
./b2 -d0 address-model=64 cxxflags=-fPIC link=static threading=multi variant=release install && \
rm -rf /boost-${BOOST_VERSION}.tar.gz /boost-${BOOST_VERSION}
rm -rf /boost-${BOOST_VERSION}-b2-nodocs.tar.gz /boost-${BOOST_VERSION}

# Download and compile protobuf
RUN PROTOBUF_VERSION=$(dep-version.py protobuf) && \
Expand Down
6 changes: 3 additions & 3 deletions pkg/deb/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,12 @@ ADD .build/dep-version.py /usr/local/bin

# Download and compile boost
RUN BOOST_VERSION=$(dep-version.py boost) && \
curl -O -L https://github.com/boostorg/boost/releases/download/boost-${BOOST_VERSION}/boost-${BOOST_VERSION}.tar.gz && \
tar zxf boost-${BOOST_VERSION}.tar.gz && \
curl -O -L https://github.com/boostorg/boost/releases/download/boost-${BOOST_VERSION}/boost-${BOOST_VERSION}-b2-nodocs.tar.gz && \
tar zxf boost-${BOOST_VERSION}-b2-nodocs.tar.gz && \
cd boost-${BOOST_VERSION} && \
./bootstrap.sh --with-libraries=regex && \
./b2 -d0 address-model=64 cxxflags=-fPIC link=static threading=multi variant=release install && \
rm -rf /boost-${BOOST_VERSION}.tar.gz /boost-${BOOST_VERSION}
rm -rf /boost-${BOOST_VERSION}-b2-nodocs.tar.gz /boost-${BOOST_VERSION}

RUN CMAKE_VERSION=$(dep-version.py cmake) && \
curl -O -L https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-linux-${PLATFORM}.tar.gz && \
Expand Down
4 changes: 2 additions & 2 deletions pkg/mac/build-static-library.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ CURL_VERSION=$(./dep-version.py curl)

if [ ! -f boost/.done ]; then
echo "Building Boost $BOOST_VERSION"
curl -O -L https://github.com/boostorg/boost/releases/download/boost-${BOOST_VERSION}/boost-${BOOST_VERSION}.tar.gz
tar zxf boost-${BOOST_VERSION}.tar.gz
curl -O -L https://github.com/boostorg/boost/releases/download/boost-${BOOST_VERSION}/boost-${BOOST_VERSION}-b2-nodocs.tar.gz
tar zxf boost-${BOOST_VERSION}-b2-nodocs.tar.gz
mkdir -p $PREFIX/include
pushd boost-${BOOST_VERSION}
./bootstrap.sh
Expand Down
6 changes: 3 additions & 3 deletions pkg/rpm/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,12 @@ ADD .build/dep-version.py /usr/local/bin
# GCC 4.8.2 implementation of std::regex is buggy, so we install boost::regex here
RUN BOOST_VERSION=$(dep-version.py boost) && \
echo "BOOST VERSION: '${BOOST_VERSION}'" && \
curl -O -L https://github.com/boostorg/boost/releases/download/boost-${BOOST_VERSION}/boost-${BOOST_VERSION}.tar.gz && \
tar zxf boost-${BOOST_VERSION}.tar.gz && \
curl -O -L https://github.com/boostorg/boost/releases/download/boost-${BOOST_VERSION}/boost-${BOOST_VERSION}-b2-nodocs.tar.gz && \
tar zxf boost-${BOOST_VERSION}-b2-nodocs.tar.gz && \
cd boost-${BOOST_VERSION} && \
./bootstrap.sh --with-libraries=regex && \
./b2 address-model=64 cxxflags="-fPIC -std=c++11" link=static threading=multi variant=release install && \
rm -rf /boost-${BOOST_VERSION}.tar.gz /boost-${BOOST_VERSION}
rm -rf /boost-${BOOST_VERSION}-b2-nodocs.tar.gz /boost-${BOOST_VERSION}

RUN CMAKE_VERSION=$(dep-version.py cmake) && \
curl -O -L https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-linux-${PLATFORM}.tar.gz && \
Expand Down
2 changes: 1 addition & 1 deletion vcpkg
Open in desktop
Submodule vcpkg updated 3890 files
24 changes: 14 additions & 10 deletions vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,54 +2,58 @@
"name": "pulsar-cpp",
"version": "3.5.0",
"description": "Pulsar C++ SDK",
"builtin-baseline": "b051745c68faa6f65c493371d564c4eb8af34dad",
"builtin-baseline": "b27651341123a59f7187b42ef2bc476284afb310",
"dependencies": [
{
"name": "asio",
"features": [
"openssl"
],
"version>=": "1.28.2"
"version>=": "1.30.2"
},
{
"name": "boost-accumulators",
"version>=": "1.83.0"
"version>=": "1.85.0"
},
{
"name": "boost-format",
"version>=": "1.85.0"
},
{
"name": "boost-property-tree",
"version>=": "1.83.0"
"version>=": "1.85.0"
},
{
"name": "curl",
"default-features": false,
"features": [
"openssl"
],
"version>=": "8.4.0"
"version>=": "8.8.0"
},
{
"name": "dlfcn-win32",
"platform": "windows"
},
{
"name": "openssl",
"version>=": "3.1.4#1"
"version>=": "3.3.1"
},
{
"name": "protobuf",
"version>=": "3.21.12"
"version>=": "3.21.12#3"
},
{
"name": "snappy",
"version>=": "1.1.10"
},
{
"name": "zlib",
"version>=": "1.3"
"version>=": "1.3.1"
},
{
"name": "zstd",
"version>=": "1.5.5"
"version>=": "1.5.6"
}
],
"features": {
Expand All @@ -58,7 +62,7 @@
"dependencies": [
{
"name": "boost-program-options",
"version>=": "1.83.0"
"version>=": "1.85.0"
}
]
},
Expand Down
Loading