Skip to content

Commit

Permalink
Upgrade unixodbc version to 2.3.12
Browse files Browse the repository at this point in the history
Disable tests and examples in mongo build
[docker_verify]
  • Loading branch information
sumeetchhetri committed Jun 8, 2024
1 parent ebe0d82 commit 9d24056
Show file tree
Hide file tree
Showing 33 changed files with 53 additions and 47 deletions.
10 changes: 8 additions & 2 deletions .github/workflows/ci-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,14 @@ jobs:
- name: Install dependencies
run: |
#brew unlink bazel
brew install libpq openssl ossp-uuid unixodbc libmemcached boost jsoncpp apr apr-util pkgconfig httpd ninja mongo-c-driver
brew install ossp-uuid libmemcached boost jsoncpp apr apr-util httpd ninja mongo-c-driver
pushd /tmp
wget -q https://ftp.osuosl.org/pub/blfs/conglomeration/unixODBC/unixODBC-2.3.12.tar.gz
tar zxf unixODBC-2.3.12.tar.gz
cd unixODBC-2.3.12
./configure && make && make install
cd /tmp
rm -rf unixODBC-2.3.12
#if [ -f /usr/local/lib/libssl.dylib ]; then
# sudo mv /usr/local/lib/libssl.dylib /usr/local/lib/libssl_bak.dylib
#fi
Expand All @@ -42,7 +49,6 @@ jobs:
#if [ -d /usr/local/Cellar/openssl@1.1/1.1.1g/include ]; then
# sudo ln -s /usr/local/Cellar/openssl@1.1/1.1.1g/include /usr/local/include/openssl
#fi
pushd /tmp
wget -q https://github.com/efficient/libcuckoo/archive/master.zip
unzip master.zip
rm -f master.zip
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
rm -f "mongo-c-driver-$VERSION.tar.gz"
cd mongo-c-driver-$VERSION/ && mkdir _build && cmake -S . -B _build \
-D ENABLE_EXTRA_ALIGNMENT=OFF \
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF \
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -D ENABLE_TESTS=OFF -D ENABLE_EXAMPLES=OFF \
-D CMAKE_BUILD_TYPE=RelWithDebInfo \
-D BUILD_VERSION="$VERSION" \
-D ENABLE_SSL=OFF \
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ jobs:
rm -f "mongo-c-driver-$VERSION.tar.gz"
cd mongo-c-driver-$VERSION/ && mkdir _build && cmake -S . -B _build \
-D ENABLE_EXTRA_ALIGNMENT=OFF \
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF \
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -D ENABLE_TESTS=OFF -D ENABLE_EXAMPLES=OFF \
-D CMAKE_BUILD_TYPE=RelWithDebInfo \
-D BUILD_VERSION="$VERSION" \
-D ENABLE_SSL=OFF \
Expand Down
10 changes: 5 additions & 5 deletions docker/DockerFile-cross-archlinux-mingw64
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,16 @@ RUN pacman -S --noconfirm --noprogressbar gcc gcc-libs glibc libtool mingw-w64-g
ENV TARGET=x86_64-w64-mingw32

WORKDIR /tmp
RUN wget -q https://ftp.osuosl.org/pub/blfs/conglomeration/unixODBC/unixODBC-2.3.7.tar.gz
RUN tar zxvf unixODBC-2.3.7.tar.gz
RUN rm -f unixODBC-2.3.7.tar.gz
WORKDIR unixODBC-2.3.7
RUN wget -q https://ftp.osuosl.org/pub/blfs/conglomeration/unixODBC/unixODBC-2.3.12.tar.gz
RUN tar zxvf unixODBC-2.3.12.tar.gz
RUN rm -f unixODBC-2.3.12.tar.gz
WORKDIR unixODBC-2.3.12
RUN env NM=${TARGET}-nm AS=${TARGET}-as LD=${TARGET}-ld CC=${TARGET}-gcc AR=${TARGET}-ar \
RANLIB=${TARGET}-ranlib CFLAGS="-D_FORTIFY_SOURCE=2" LDFLAGS="-lssp" ./configure --host=${TARGET} --prefix=/usr/${TARGET}
RUN ${TARGET}-make
RUN ${TARGET}-make install
WORKDIR /tmp
RUN rm -rf unixODBC-2.3.7
RUN rm -rf unixODBC-2.3.12

RUN wget -q https://github.com/sean-/ossp-uuid/archive/master.zip
RUN unzip -qq master.zip
Expand Down
2 changes: 1 addition & 1 deletion docker/all/scripts/install_ffead-cpp-dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ tar xf "mongo-c-driver-$MONGO_VERSION.tar.gz"
rm -f "mongo-c-driver-$MONGO_VERSION.tar.gz"
cd mongo-c-driver-$MONGO_VERSION/ && mkdir _build && cmake -S . -B _build \
-D ENABLE_EXTRA_ALIGNMENT=OFF \
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF \
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -D ENABLE_TESTS=OFF -D ENABLE_EXAMPLES=OFF \
-D CMAKE_BUILD_TYPE=RelWithDebInfo \
-D BUILD_VERSION="$MONGO_VERSION" \
-D ENABLE_SSL=OFF \
Expand Down
8 changes: 4 additions & 4 deletions docker/install_cygwin.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ make install
cd /tmp
rm -rf libcuckoo-master

wget -q https://ftp.osuosl.org/pub/blfs/conglomeration/unixODBC/unixODBC-2.3.7.tar.gz
tar zxf unixODBC-2.3.7.tar.gz
cd unixODBC-2.3.7
wget -q https://ftp.osuosl.org/pub/blfs/conglomeration/unixODBC/unixODBC-2.3.12.tar.gz
tar zxf unixODBC-2.3.12.tar.gz
cd unixODBC-2.3.12
./configure
make
make install
cd /tmp
rm -rf unixODBC-2.3.7
rm -rf unixODBC-2.3.12

wget -q https://github.com/redis/hiredis/archive/v0.13.3.tar.gz
tar zxf v0.13.3.tar.gz
Expand Down
2 changes: 1 addition & 1 deletion docker/install_mingw.sh
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ tar xf "mongo-c-driver-$VERSION.tar.gz"
rm -f "mongo-c-driver-$VERSION.tar.gz"
cd mongo-c-driver-$VERSION/ && mkdir _build && cmake -G "MinGW Makefiles" -S . -B _build \
-D ENABLE_EXTRA_ALIGNMENT=OFF \
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF \
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -D ENABLE_TESTS=OFF -D ENABLE_EXAMPLES=OFF \
-D CMAKE_BUILD_TYPE=RelWithDebInfo \
-D BUILD_VERSION="$VERSION" \
-D ENABLE_SSL=OFF \
Expand Down
2 changes: 1 addition & 1 deletion docker/os-based/DockerFile-Almalinux-x64-ffead-cpp
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ RUN tar xf "mongo-c-driver-$VERSION.tar.gz"
RUN rm -f "mongo-c-driver-$VERSION.tar.gz"
RUN cd mongo-c-driver-$VERSION/ && mkdir _build && cmake -S . -B _build \
-D ENABLE_EXTRA_ALIGNMENT=OFF \
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF \
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -D ENABLE_TESTS=OFF -D ENABLE_EXAMPLES=OFF \
-D CMAKE_BUILD_TYPE=RelWithDebInfo \
-D BUILD_VERSION="$VERSION" \
-D ENABLE_SSL=OFF \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ RUN tar xf "mongo-c-driver-$VERSION.tar.gz"
RUN rm -f "mongo-c-driver-$VERSION.tar.gz"
RUN cd mongo-c-driver-$VERSION/ && mkdir _build && cmake -S . -B _build \
-D ENABLE_EXTRA_ALIGNMENT=OFF \
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF \
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -D ENABLE_TESTS=OFF -D ENABLE_EXAMPLES=OFF \
-D CMAKE_BUILD_TYPE=RelWithDebInfo \
-D BUILD_VERSION="$VERSION" \
-D ENABLE_SSL=OFF \
Expand Down
2 changes: 1 addition & 1 deletion docker/os-based/DockerFile-Alpine-x64-ffead-cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ RUN tar xf "mongo-c-driver-$VERSION.tar.gz"
RUN rm -f "mongo-c-driver-$VERSION.tar.gz"
RUN cd mongo-c-driver-$VERSION/ && mkdir _build && cmake -S . -B _build \
-D ENABLE_EXTRA_ALIGNMENT=OFF \
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF \
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -D ENABLE_TESTS=OFF -D ENABLE_EXAMPLES=OFF \
-D CMAKE_BUILD_TYPE=RelWithDebInfo \
-D BUILD_VERSION="$VERSION" \
-D ENABLE_SSL=OFF \
Expand Down
2 changes: 1 addition & 1 deletion docker/os-based/DockerFile-Alpine-x64-ffead-cpp_autoconf
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ RUN tar xf "mongo-c-driver-$VERSION.tar.gz"
RUN rm -f "mongo-c-driver-$VERSION.tar.gz"
RUN cd mongo-c-driver-$VERSION/ && mkdir _build && cmake -S . -B _build \
-D ENABLE_EXTRA_ALIGNMENT=OFF \
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF \
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -D ENABLE_TESTS=OFF -D ENABLE_EXAMPLES=OFF \
-D CMAKE_BUILD_TYPE=RelWithDebInfo \
-D BUILD_VERSION="$VERSION" \
-D ENABLE_SSL=OFF \
Expand Down
4 changes: 2 additions & 2 deletions docker/os-based/DockerFile-ArchLinux-x64-ffead-cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM archlinux:latest
FROM archlinux:base-devel

#RUN patched_glibc=glibc-linux4-2.33-4-x86_64.pkg.tar.zst && \
# curl -LO "https://repo.archlinuxcn.org/x86_64/$patched_glibc" && \
Expand Down Expand Up @@ -48,7 +48,7 @@ RUN tar xf "mongo-c-driver-$VERSION.tar.gz"
RUN rm -f "mongo-c-driver-$VERSION.tar.gz"
RUN cd mongo-c-driver-$VERSION/ && mkdir _build && cmake -S . -B _build \
-D ENABLE_EXTRA_ALIGNMENT=OFF \
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF \
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -D ENABLE_TESTS=OFF -D ENABLE_EXAMPLES=OFF \
-D CMAKE_BUILD_TYPE=RelWithDebInfo \
-D BUILD_VERSION="$VERSION" \
-D ENABLE_SSL=OFF \
Expand Down
4 changes: 2 additions & 2 deletions docker/os-based/DockerFile-ArchLinux-x64-ffead-cpp_autoconf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM archlinux:latest
FROM archlinux:base-devel

#RUN patched_glibc=glibc-linux4-2.33-4-x86_64.pkg.tar.zst && \
# curl -LO "https://repo.archlinuxcn.org/x86_64/$patched_glibc" && \
Expand Down Expand Up @@ -48,7 +48,7 @@ RUN tar xf "mongo-c-driver-$VERSION.tar.gz"
RUN rm -f "mongo-c-driver-$VERSION.tar.gz"
RUN cd mongo-c-driver-$VERSION/ && mkdir _build && cmake -S . -B _build \
-D ENABLE_EXTRA_ALIGNMENT=OFF \
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF \
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -D ENABLE_TESTS=OFF -D ENABLE_EXAMPLES=OFF \
-D CMAKE_BUILD_TYPE=RelWithDebInfo \
-D BUILD_VERSION="$VERSION" \
-D ENABLE_SSL=OFF \
Expand Down
2 changes: 1 addition & 1 deletion docker/os-based/DockerFile-Gentoo-x64-ffead-cpp
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ RUN tar xf "mongo-c-driver-$VERSION.tar.gz"
RUN rm -f "mongo-c-driver-$VERSION.tar.gz"
RUN cd mongo-c-driver-$VERSION/ && mkdir _build && cmake -S . -B _build \
-D ENABLE_EXTRA_ALIGNMENT=OFF \
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF \
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -D ENABLE_TESTS=OFF -D ENABLE_EXAMPLES=OFF \
-D CMAKE_BUILD_TYPE=RelWithDebInfo \
-D BUILD_VERSION="$VERSION" \
-D ENABLE_SSL=OFF \
Expand Down
2 changes: 1 addition & 1 deletion docker/os-based/DockerFile-Gentoo-x64-ffead-cpp_autoconf
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ RUN tar xf "mongo-c-driver-$VERSION.tar.gz"
RUN rm -f "mongo-c-driver-$VERSION.tar.gz"
RUN cd mongo-c-driver-$VERSION/ && mkdir _build && cmake -S . -B _build \
-D ENABLE_EXTRA_ALIGNMENT=OFF \
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF \
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -D ENABLE_TESTS=OFF -D ENABLE_EXAMPLES=OFF \
-D CMAKE_BUILD_TYPE=RelWithDebInfo \
-D BUILD_VERSION="$VERSION" \
-D ENABLE_SSL=OFF \
Expand Down
2 changes: 1 addition & 1 deletion docker/os-based/DockerFile-OpenSuse-x64-ffead-cpp
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ RUN tar xf "mongo-c-driver-$VERSION.tar.gz"
RUN rm -f "mongo-c-driver-$VERSION.tar.gz"
RUN cd mongo-c-driver-$VERSION/ && mkdir _build && cmake -S . -B _build \
-D ENABLE_EXTRA_ALIGNMENT=OFF \
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF \
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -D ENABLE_TESTS=OFF -D ENABLE_EXAMPLES=OFF \
-D CMAKE_BUILD_TYPE=RelWithDebInfo \
-D BUILD_VERSION="$VERSION" \
-D ENABLE_SSL=OFF \
Expand Down
2 changes: 1 addition & 1 deletion docker/os-based/DockerFile-OpenSuse-x64-ffead-cpp_autoconf
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ RUN tar xf "mongo-c-driver-$VERSION.tar.gz"
RUN rm -f "mongo-c-driver-$VERSION.tar.gz"
RUN cd mongo-c-driver-$VERSION/ && mkdir _build && cmake -S . -B _build \
-D ENABLE_EXTRA_ALIGNMENT=OFF \
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF \
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -D ENABLE_TESTS=OFF -D ENABLE_EXAMPLES=OFF \
-D CMAKE_BUILD_TYPE=RelWithDebInfo \
-D BUILD_VERSION="$VERSION" \
-D ENABLE_SSL=OFF \
Expand Down
2 changes: 1 addition & 1 deletion docker/os-based/DockerFile-Ubuntu-x64-ffead-cpp
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ RUN tar xf "mongo-c-driver-$VERSION.tar.gz"
RUN rm -f "mongo-c-driver-$VERSION.tar.gz"
RUN cd mongo-c-driver-$VERSION/ && mkdir _build && cmake -S . -B _build \
-D ENABLE_EXTRA_ALIGNMENT=OFF \
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF \
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -D ENABLE_TESTS=OFF -D ENABLE_EXAMPLES=OFF \
-D CMAKE_BUILD_TYPE=RelWithDebInfo \
-D BUILD_VERSION="$VERSION" \
-D ENABLE_SSL=OFF \
Expand Down
2 changes: 1 addition & 1 deletion docker/os-based/DockerFile-Ubuntu-x64-ffead-cpp-bazel
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ RUN tar xf "mongo-c-driver-$VERSION.tar.gz"
RUN rm -f "mongo-c-driver-$VERSION.tar.gz"
RUN cd mongo-c-driver-$VERSION/ && mkdir _build && cmake -S . -B _build \
-D ENABLE_EXTRA_ALIGNMENT=OFF \
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF \
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -D ENABLE_TESTS=OFF -D ENABLE_EXAMPLES=OFF \
-D CMAKE_BUILD_TYPE=RelWithDebInfo \
-D BUILD_VERSION="$VERSION" \
-D ENABLE_SSL=OFF \
Expand Down
2 changes: 1 addition & 1 deletion docker/os-based/DockerFile-Ubuntu-x64-ffead-cpp-buck2
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ RUN tar xf "mongo-c-driver-$VERSION.tar.gz"
RUN rm -f "mongo-c-driver-$VERSION.tar.gz"
RUN cd mongo-c-driver-$VERSION/ && mkdir _build && cmake -S . -B _build \
-D ENABLE_EXTRA_ALIGNMENT=OFF \
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF \
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -D ENABLE_TESTS=OFF -D ENABLE_EXAMPLES=OFF \
-D CMAKE_BUILD_TYPE=RelWithDebInfo \
-D BUILD_VERSION="$VERSION" \
-D ENABLE_SSL=OFF \
Expand Down
2 changes: 1 addition & 1 deletion docker/os-based/DockerFile-Ubuntu-x64-ffead-cpp-meson
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ RUN tar xf "mongo-c-driver-$VERSION.tar.gz"
RUN rm -f "mongo-c-driver-$VERSION.tar.gz"
RUN cd mongo-c-driver-$VERSION/ && mkdir _build && cmake -S . -B _build \
-D ENABLE_EXTRA_ALIGNMENT=OFF \
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF \
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -D ENABLE_TESTS=OFF -D ENABLE_EXAMPLES=OFF \
-D CMAKE_BUILD_TYPE=RelWithDebInfo \
-D BUILD_VERSION="$VERSION" \
-D ENABLE_SSL=OFF \
Expand Down
2 changes: 1 addition & 1 deletion docker/os-based/DockerFile-Ubuntu-x64-ffead-cpp-scons
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ RUN tar xf "mongo-c-driver-$VERSION.tar.gz"
RUN rm -f "mongo-c-driver-$VERSION.tar.gz"
RUN cd mongo-c-driver-$VERSION/ && mkdir _build && cmake -S . -B _build \
-D ENABLE_EXTRA_ALIGNMENT=OFF \
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF \
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -D ENABLE_TESTS=OFF -D ENABLE_EXAMPLES=OFF \
-D CMAKE_BUILD_TYPE=RelWithDebInfo \
-D BUILD_VERSION="$VERSION" \
-D ENABLE_SSL=OFF \
Expand Down
2 changes: 1 addition & 1 deletion docker/os-based/DockerFile-Ubuntu-x64-ffead-cpp-shellb
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ RUN tar xf "mongo-c-driver-$VERSION.tar.gz"
RUN rm -f "mongo-c-driver-$VERSION.tar.gz"
RUN cd mongo-c-driver-$VERSION/ && mkdir _build && cmake -S . -B _build \
-D ENABLE_EXTRA_ALIGNMENT=OFF \
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF \
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -D ENABLE_TESTS=OFF -D ENABLE_EXAMPLES=OFF \
-D CMAKE_BUILD_TYPE=RelWithDebInfo \
-D BUILD_VERSION="$VERSION" \
-D ENABLE_SSL=OFF \
Expand Down
2 changes: 1 addition & 1 deletion docker/os-based/DockerFile-Ubuntu-x64-ffead-cpp-xmake
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ RUN tar xf "mongo-c-driver-$VERSION.tar.gz"
RUN rm -f "mongo-c-driver-$VERSION.tar.gz"
RUN cd mongo-c-driver-$VERSION/ && mkdir _build && cmake -S . -B _build \
-D ENABLE_EXTRA_ALIGNMENT=OFF \
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF \
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -D ENABLE_TESTS=OFF -D ENABLE_EXAMPLES=OFF \
-D CMAKE_BUILD_TYPE=RelWithDebInfo \
-D BUILD_VERSION="$VERSION" \
-D ENABLE_SSL=OFF \
Expand Down
2 changes: 1 addition & 1 deletion docker/os-based/DockerFile-Ubuntu-x64-ffead-cpp_autoconf
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ RUN tar xf "mongo-c-driver-$VERSION.tar.gz"
RUN rm -f "mongo-c-driver-$VERSION.tar.gz"
RUN cd mongo-c-driver-$VERSION/ && mkdir _build && cmake -S . -B _build \
-D ENABLE_EXTRA_ALIGNMENT=OFF \
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF \
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -D ENABLE_TESTS=OFF -D ENABLE_EXAMPLES=OFF \
-D CMAKE_BUILD_TYPE=RelWithDebInfo \
-D BUILD_VERSION="$VERSION" \
-D ENABLE_SSL=OFF \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ RUN tar xf "mongo-c-driver-$VERSION.tar.gz"
RUN rm -f "mongo-c-driver-$VERSION.tar.gz"
RUN cd mongo-c-driver-$VERSION/ && mkdir _build && cmake -S . -B _build \
-D ENABLE_EXTRA_ALIGNMENT=OFF \
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF \
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -D ENABLE_TESTS=OFF -D ENABLE_EXAMPLES=OFF \
-D CMAKE_BUILD_TYPE=RelWithDebInfo \
-D BUILD_VERSION="$VERSION" \
-D ENABLE_SSL=OFF \
Expand Down
2 changes: 1 addition & 1 deletion docker/te/scripts/install_ffead-cpp-dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ tar xf "mongo-c-driver-$MONGO_VERSION.tar.gz"
rm -f "mongo-c-driver-$MONGO_VERSION.tar.gz"
cd mongo-c-driver-$MONGO_VERSION/ && mkdir _build && cmake -S . -B _build \
-D ENABLE_EXTRA_ALIGNMENT=OFF \
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF \
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -D ENABLE_TESTS=OFF -D ENABLE_EXAMPLES=OFF \
-D CMAKE_BUILD_TYPE=RelWithDebInfo \
-D BUILD_VERSION="$MONGO_VERSION" \
-D ENABLE_SSL=OFF \
Expand Down
2 changes: 1 addition & 1 deletion docker/te/tekp/install_ffead-cpp-dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ RUN tar xf "mongo-c-driver-$VERSION.tar.gz"
RUN rm -f "mongo-c-driver-$VERSION.tar.gz"
RUN cd mongo-c-driver-$VERSION/ && mkdir _build && cmake -S . -B _build \
-D ENABLE_EXTRA_ALIGNMENT=OFF \
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF \
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -D ENABLE_TESTS=OFF -D ENABLE_EXAMPLES=OFF \
-D CMAKE_BUILD_TYPE=RelWithDebInfo \
-D BUILD_VERSION="$VERSION" \
-D ENABLE_SSL=OFF \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ RUN tar xf "mongo-c-driver-$VERSION.tar.gz"
RUN rm -f "mongo-c-driver-$VERSION.tar.gz"
RUN cd mongo-c-driver-$VERSION/ && mkdir _build && cmake -S . -B _build \
-D ENABLE_EXTRA_ALIGNMENT=OFF \
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF \
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -D ENABLE_TESTS=OFF -D ENABLE_EXAMPLES=OFF \
-D CMAKE_BUILD_TYPE=RelWithDebInfo \
-D BUILD_VERSION="$VERSION" \
-D ENABLE_SSL=OFF \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ RUN tar xf "mongo-c-driver-$VERSION.tar.gz"
RUN rm -f "mongo-c-driver-$VERSION.tar.gz"
RUN cd mongo-c-driver-$VERSION/ && mkdir _build && cmake -S . -B _build \
-D ENABLE_EXTRA_ALIGNMENT=OFF \
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF \
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -D ENABLE_TESTS=OFF -D ENABLE_EXAMPLES=OFF \
-D CMAKE_BUILD_TYPE=RelWithDebInfo \
-D BUILD_VERSION="$VERSION" \
-D ENABLE_SSL=OFF \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ RUN tar xf "mongo-c-driver-$VERSION.tar.gz"
RUN rm -f "mongo-c-driver-$VERSION.tar.gz"
RUN cd mongo-c-driver-$VERSION/ && mkdir _build && cmake -S . -B _build \
-D ENABLE_EXTRA_ALIGNMENT=OFF \
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF \
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -D ENABLE_TESTS=OFF -D ENABLE_EXAMPLES=OFF \
-D CMAKE_BUILD_TYPE=RelWithDebInfo \
-D BUILD_VERSION="$VERSION" \
-D ENABLE_SSL=OFF \
Expand Down
2 changes: 1 addition & 1 deletion docker/test/install_deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ RUN tar xf "mongo-c-driver-$VERSION.tar.gz"
RUN rm -f "mongo-c-driver-$VERSION.tar.gz"
RUN cd mongo-c-driver-$VERSION/ && mkdir _build && cmake -S . -B _build \
-D ENABLE_EXTRA_ALIGNMENT=OFF \
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF \
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -D ENABLE_TESTS=OFF -D ENABLE_EXAMPLES=OFF \
-D CMAKE_BUILD_TYPE=RelWithDebInfo \
-D BUILD_VERSION="$VERSION" \
-D ENABLE_SSL=OFF \
Expand Down
10 changes: 5 additions & 5 deletions vagrant/solaris/bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,15 @@ cd /tmp
rm -rf libcuckoo-master

cd /tmp
wget -q https://ftp.osuosl.org/pub/blfs/conglomeration/unixODBC/unixODBC-2.3.7.tar.gz
tar xf unixODBC-2.3.7.tar.gz
rm -f unixODBC-2.3.7.tar.gz
cd unixODBC-2.3.7
wget -q https://ftp.osuosl.org/pub/blfs/conglomeration/unixODBC/unixODBC-2.3.12.tar.gz
tar xf unixODBC-2.3.12.tar.gz
rm -f unixODBC-2.3.12.tar.gz
cd unixODBC-2.3.12
./configure
make
make install
cd /tmp
rm -rf unixODBC-2.3.7
rm -rf unixODBC-2.3.12

crle -u -s /usr/local/lib/
crle -64 -u -s /usr/local/lib/
Expand Down

0 comments on commit 9d24056

Please sign in to comment.