Skip to content

Commit

Permalink
Archlinux base-devel has devel libs already, skip updated curl as it …
Browse files Browse the repository at this point in the history
…breaks due to dep-openssl-3.3

[docker_verify]
  • Loading branch information
sumeetchhetri committed Jun 8, 2024
1 parent ad4270b commit ebe0d82
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 27 deletions.
44 changes: 19 additions & 25 deletions .github/workflows/ci-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,25 +23,25 @@ jobs:
- name: Install dependencies
run: |
#brew unlink bazel
brew install libpq openssl@1.1 ossp-uuid unixodbc libmemcached boost jsoncpp apr apr-util pkgconfig httpd ninja mongo-c-driver
if [ -f /usr/local/lib/libssl.dylib ]; then
sudo mv /usr/local/lib/libssl.dylib /usr/local/lib/libssl_bak.dylib
fi
if [ -f /usr/local/lib/libcrypto.dylib ]; then
sudo mv /usr/local/lib/libcrypto.dylib /usr/local/lib/libcrypto_bak.dylib
fi
if [ -f /usr/local/Cellar/openssl@1.1/1.1.1g/lib/libssl.1.1.dylib ]; then
sudo ln -s /usr/local/Cellar/openssl@1.1/1.1.1g/lib/libssl.1.1.dylib /usr/local/lib/libssl.dylib
fi
if [ -f /usr/local/Cellar/openssl@1.1/1.1.1g/lib/libcrypto.1.1.dylib ]; then
sudo ln -s /usr/local/Cellar/openssl@1.1/1.1.1g/lib/libcrypto.1.1.dylib /usr/local/lib/libcrypto.dylib
fi
if [ -d /usr/local/include/openssl ]; then
sudo mv /usr/local/include/openssl /usr/local/include/openssl_bak
fi
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
brew install libpq openssl ossp-uuid unixodbc libmemcached boost jsoncpp apr apr-util pkgconfig httpd ninja mongo-c-driver
#if [ -f /usr/local/lib/libssl.dylib ]; then
# sudo mv /usr/local/lib/libssl.dylib /usr/local/lib/libssl_bak.dylib
#fi
#if [ -f /usr/local/lib/libcrypto.dylib ]; then
# sudo mv /usr/local/lib/libcrypto.dylib /usr/local/lib/libcrypto_bak.dylib
#fi
#if [ -f /usr/local/Cellar/openssl@1.1/1.1.1g/lib/libssl.1.1.dylib ]; then
# sudo ln -s /usr/local/Cellar/openssl@1.1/1.1.1g/lib/libssl.1.1.dylib /usr/local/lib/libssl.dylib
#fi
#if [ -f /usr/local/Cellar/openssl@1.1/1.1.1g/lib/libcrypto.1.1.dylib ]; then
# sudo ln -s /usr/local/Cellar/openssl@1.1/1.1.1g/lib/libcrypto.1.1.dylib /usr/local/lib/libcrypto.dylib
#fi
#if [ -d /usr/local/include/openssl ]; then
# sudo mv /usr/local/include/openssl /usr/local/include/openssl_bak
#fi
#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
Expand All @@ -50,12 +50,6 @@ jobs:
cmake -DCMAKE_INSTALL_PREFIX=/usr/local . && sudo make install
cd /tmp
rm -rf libcuckoo-master
#wget -q https://github.com/mongodb/mongo-c-driver/releases/download/1.4.2/mongo-c-driver-1.4.2.tar.gz
#tar xf mongo-c-driver-1.4.2.tar.gz
#rm -f mongo-c-driver-1.4.2.tar.gz
#cd mongo-c-driver-1.4.2/ && ./configure --disable-automatic-init-and-cleanup && make && sudo make install
#cd /tmp
#rm -rf mongo-c-driver-1.4.2
wget -q https://github.com/redis/hiredis/archive/v1.0.0.tar.gz
tar xf v1.0.0.tar.gz
rm -f v1.0.0.tar.gz
Expand Down
2 changes: 1 addition & 1 deletion docker/os-based/DockerFile-ArchLinux-x64-ffead-cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ FROM archlinux:latest
# bsdtar -C / -xvf "$patched_glibc"
#RUN echo "IgnorePkg = glibc" >> /etc/pacman.conf

RUN pacman -Sy --noconfirm gcc gcc-libs glibc autoconf-archive autoconf automake libtool make clang unixodbc curl postgresql-libs libmemcached cmake openssh wget gnu-netcat tar gzip zlib unzip gawk grep sed core/binutils diffutils procps-ng openldap
RUN pacman -Sy --noconfirm gcc gcc-libs autoconf-archive clang unixodbc postgresql-libs libmemcached cmake openssh wget gnu-netcat unzip

#Install libcuckoo headers
WORKDIR /tmp
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ FROM archlinux:latest
# bsdtar -C / -xvf "$patched_glibc"
#RUN echo "IgnorePkg = glibc" >> /etc/pacman.conf

RUN pacman -Sy --noconfirm gcc gcc-libs glibc autoconf-archive autoconf automake libtool make clang unixodbc curl postgresql-libs libmemcached cmake openssh wget gnu-netcat tar gzip zlib unzip gawk grep sed core/binutils diffutils procps-ng openldap
RUN pacman -Sy --noconfirm gcc gcc-libs autoconf-archive clang unixodbc postgresql-libs libmemcached cmake openssh wget gnu-netcat unzip

#Install libcuckoo headers
WORKDIR /tmp
Expand Down

0 comments on commit ebe0d82

Please sign in to comment.