Skip to content

Commit b306d30

Browse files
Pull new libmongoc package deps, fix bad spec patch
1 parent 58b7a09 commit b306d30

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

.evergreen/build_snapshot_rpm.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ build_dir=$(basename $(pwd))
7676
sudo mock -r ${config} --use-bootstrap-image --isolation=simple --clean
7777
sudo mock -r ${config} --use-bootstrap-image --isolation=simple --init
7878
mock_root=$(sudo mock -r ${config} --use-bootstrap-image --isolation=simple --print-root-path)
79-
sudo mock -r ${config} --use-bootstrap-image --isolation=simple --install rpmdevtools git rpm-build cmake boost-devel openssl-devel cyrus-sasl-devel libbson-devel mongo-c-driver-devel snappy-devel gcc-c++ libzstd-devel
79+
sudo mock -r ${config} --use-bootstrap-image --isolation=simple --install rpmdevtools git rpm-build cmake boost-devel openssl-devel cyrus-sasl-devel libbson-devel mongo-c-driver-devel snappy-devel gcc-c++ libzstd-devel utf8proc-devel pkgconf
8080
sudo mock -r ${config} --use-bootstrap-image --isolation=simple --copyin "$(pwd)" "$(pwd)/${spec_file}" /tmp
8181
if [ ! -f build/VERSION_CURRENT ]; then
8282
sudo mock -r ${config} --use-bootstrap-image --isolation=simple --cwd "/tmp/${build_dir}" --chroot -- /bin/sh -c "(

.evergreen/debian_package_build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ export DEBOOTSTRAP_DIR=`pwd`/debootstrap.git
5151
sudo -nE ./debootstrap.git/debootstrap --verbose unstable ./unstable-chroot/ http://cdn-aws.deb.debian.org/debian < /dev/null
5252
cp -a mongo-cxx-driver ./unstable-chroot/tmp/
5353
sudo -n DEB_BUILD_PROFILES="${DEB_BUILD_PROFILES}" chroot ./unstable-chroot /bin/bash -x -c "
54-
(apt-get install -y build-essential git-buildpackage fakeroot debhelper cmake curl ca-certificates libboost-dev libsasl2-dev libicu-dev doxygen ${MNMLSTC_DEPS} && \
54+
(apt-get install -y build-essential git-buildpackage fakeroot debhelper cmake curl ca-certificates libboost-dev libsasl2-dev libicu-dev doxygen libutf8proc-dev pkg-config ${MNMLSTC_DEPS} && \
5555
mkdir /tmp/mongo-c-driver && \
5656
curl -o deb.tar.gz -L https://s3.amazonaws.com/mciuploads/mongo-c-driver/master/mongo-c-driver-debian-packages-latest.tar.gz && \
5757
tar zxvf deb.tar.gz && \

.evergreen/spec.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- mongo-cxx-driver.spec.orig 2021-09-07 10:45:09.609476580 -0400
22
+++ mongo-cxx-driver.spec 2021-09-07 10:48:52.781980206 -0400
3-
@@ -1,8 +1,12 @@
3+
@@ -1,8 +1,10 @@
44
# for better compatibility with SCL spec file
55
%global pkg_name mongo-cxx-driver
66

@@ -12,7 +12,7 @@
1212
Release: 1%{?dist}
1313
Summary: A C++ Driver for MongoDB
1414
License: ASL 2.0
15-
@@ -10,8 +12,6 @@
15+
@@ -10,8 +12,8 @@
1616
Source0: https://github.com/mongodb/%{pkg_name}/archive/%{name}-r%{version}.tar.gz
1717

1818

0 commit comments

Comments
 (0)