Skip to content

Commit a7d57ca

Browse files
sumeetchhetrisumeetchhetri
committed
Fixed failing opensuse/gentoo builds
[docker_verify]
1 parent d0f79f8 commit a7d57ca

6 files changed

Lines changed: 35 additions & 9 deletions

‎docker/os-based/DockerFile-Gentoo-x64-base‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ FROM gentoo/stage3
22

33
RUN emerge-webrsync
44
RUN emerge -1 --unmerge dev-python/certifi:0 dev-python/setuptools:0
5-
RUN emerge sys-devel/autoconf-archive sys-devel/autoconf sys-devel/automake sys-devel/libtool dev-db/postgresql dev-db/unixODBC curl libmemcached cmake wget netcat app-arch/tar app-arch/gzip sys-libs/zlib dev-libs/mongo-c-driver
5+
RUN emerge dev-build/autoconf-archive dev-build/autoconf dev-build/automake dev-build/libtool dev-db/postgresql dev-db/unixODBC curl libmemcached cmake wget netcat app-arch/tar app-arch/gzip sys-libs/zlib

‎docker/os-based/DockerFile-Gentoo-x64-ffead-cpp‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,19 @@ WORKDIR /tmp
2929
RUN rm -rf redis-plus-plus-1.3.10
3030

3131
#Install mongodb c driver
32+
ENV VERSION=1.26.2
33+
RUN wget "https://github.com/mongodb/mongo-c-driver/archive/refs/tags/$VERSION.tar.gz" --output-document="mongo-c-driver-$VERSION.tar.gz"
34+
RUN tar xf "mongo-c-driver-$VERSION.tar.gz"
35+
RUN rm -f "mongo-c-driver-$VERSION.tar.gz"
36+
RUN cd mongo-c-driver-$VERSION/ && mkdir _build && cmake -S . -B _build \
37+
-D ENABLE_EXTRA_ALIGNMENT=OFF \
38+
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF \
39+
-D CMAKE_BUILD_TYPE=RelWithDebInfo \
40+
-D BUILD_VERSION="$VERSION" \
41+
-D ENABLE_SSL=OFF \
42+
-D ENABLE_SASL=OFF \
43+
-D ENABLE_MONGOC=ON && cmake --build _build --config RelWithDebInfo --parallel && cmake --install _build
44+
RUN rm -rf "mongo-c-driver-$VERSION"
3245
#RUN wget -q https://github.com/mongodb/mongo-c-driver/releases/download/1.4.2/mongo-c-driver-1.4.2.tar.gz
3346
#RUN tar xf mongo-c-driver-1.4.2.tar.gz
3447
#RUN rm -f mongo-c-driver-1.4.2.tar.gz

‎docker/os-based/DockerFile-Gentoo-x64-ffead-cpp_autoconf‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,19 @@ WORKDIR /tmp
2929
RUN rm -rf redis-plus-plus-1.3.10
3030

3131
#Install mongodb c driver
32+
ENV VERSION=1.26.2
33+
RUN wget "https://github.com/mongodb/mongo-c-driver/archive/refs/tags/$VERSION.tar.gz" --output-document="mongo-c-driver-$VERSION.tar.gz"
34+
RUN tar xf "mongo-c-driver-$VERSION.tar.gz"
35+
RUN rm -f "mongo-c-driver-$VERSION.tar.gz"
36+
RUN cd mongo-c-driver-$VERSION/ && mkdir _build && cmake -S . -B _build \
37+
-D ENABLE_EXTRA_ALIGNMENT=OFF \
38+
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF \
39+
-D CMAKE_BUILD_TYPE=RelWithDebInfo \
40+
-D BUILD_VERSION="$VERSION" \
41+
-D ENABLE_SSL=OFF \
42+
-D ENABLE_SASL=OFF \
43+
-D ENABLE_MONGOC=ON && cmake --build _build --config RelWithDebInfo --parallel && cmake --install _build
44+
RUN rm -rf "mongo-c-driver-$VERSION"
3245
#RUN wget -q https://github.com/mongodb/mongo-c-driver/releases/download/1.4.2/mongo-c-driver-1.4.2.tar.gz
3346
#RUN tar xf mongo-c-driver-1.4.2.tar.gz
3447
#RUN rm -f mongo-c-driver-1.4.2.tar.gz

‎docker/os-based/DockerFile-OpenSuse-x64-ffead-cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM opensuse/leap
22

3-
RUN zypper in -y autoconf-archive autoconf automake libtool perl gcc gcc-c++ make cmake postgresql-devel libcurl-devel openssl openssl-devel libmemcached-devel zlib-devel libuuid-devel unixODBC unixODBC-devel unzip wget netcat-openbsd tar gzip
3+
RUN zypper in -y autoconf-archive autoconf automake libtool perl gcc gcc-c++ make cmake postgresql-devel libcurl-devel openssl libopenssl-devel libmemcached-devel zlib-devel libuuid-devel unixODBC unixODBC-devel unzip wget netcat-openbsd tar gzip
44

55
#Install libcuckoo headers
66
WORKDIR /tmp
@@ -31,18 +31,18 @@ WORKDIR /tmp
3131
RUN rm -rf redis-plus-plus-1.3.10
3232

3333
#Install mongodb c driver
34-
VERSION=1.26.2
34+
ENV VERSION=1.26.2
3535
RUN wget "https://github.com/mongodb/mongo-c-driver/archive/refs/tags/$VERSION.tar.gz" --output-document="mongo-c-driver-$VERSION.tar.gz"
3636
RUN tar xf "mongo-c-driver-$VERSION.tar.gz"
3737
RUN rm -f "mongo-c-driver-$VERSION.tar.gz"
38-
RUN cd mongo-c-driver-$VERSION/ && cmake -S $SOURCE -B $BUILD \
38+
RUN cd mongo-c-driver-$VERSION/ && mkdir _build && cmake -S . -B _build \
3939
-D ENABLE_EXTRA_ALIGNMENT=OFF \
4040
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF \
4141
-D CMAKE_BUILD_TYPE=RelWithDebInfo \
4242
-D BUILD_VERSION="$VERSION" \
4343
-D ENABLE_SSL=OFF \
4444
-D ENABLE_SASL=OFF \
45-
-D ENABLE_MONGOC=ON && cmake --install "$BUILD" --parallel
45+
-D ENABLE_MONGOC=ON && cmake --build _build --config RelWithDebInfo --parallel && cmake --install _build
4646
RUN rm -rf "mongo-c-driver-$VERSION"
4747

4848
#Install ffead-cpp

‎docker/os-based/DockerFile-OpenSuse-x64-ffead-cpp_autoconf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,18 @@ WORKDIR /tmp
3131
RUN rm -rf redis-plus-plus-1.3.10
3232

3333
#Install mongodb c driver
34-
VERSION=1.26.2
34+
ENV VERSION=1.26.2
3535
RUN wget "https://github.com/mongodb/mongo-c-driver/archive/refs/tags/$VERSION.tar.gz" --output-document="mongo-c-driver-$VERSION.tar.gz"
3636
RUN tar xf "mongo-c-driver-$VERSION.tar.gz"
3737
RUN rm -f "mongo-c-driver-$VERSION.tar.gz"
38-
RUN cd mongo-c-driver-$VERSION/ && cmake -S $SOURCE -B $BUILD \
38+
RUN cd mongo-c-driver-$VERSION/ && mkdir _build && cmake -S . -B _build \
3939
-D ENABLE_EXTRA_ALIGNMENT=OFF \
4040
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF \
4141
-D CMAKE_BUILD_TYPE=RelWithDebInfo \
4242
-D BUILD_VERSION="$VERSION" \
4343
-D ENABLE_SSL=OFF \
4444
-D ENABLE_SASL=OFF \
45-
-D ENABLE_MONGOC=ON && cmake --install "$BUILD" --parallel
45+
-D ENABLE_MONGOC=ON && cmake --build _build --config RelWithDebInfo --parallel && cmake --install _build
4646
RUN rm -rf "mongo-c-driver-$VERSION"
4747

4848
#Install ffead-cpp

‎src/modules/sdorm/sql/libpq/LibpqDataSourceImpl.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1938,7 +1938,7 @@ bool FpgWire::handleSync() {
19381938
}
19391939

19401940
while(buffer.length()>pos+1) {
1941-
handleResponse();
1941+
if(handleResponse()==-1 || isClosed()) break;
19421942
//buffer = buffer.substr(pos);
19431943
//pos = 0;
19441944
}

0 commit comments

Comments
 (0)