Add libraries for a proper pacman compilation and execution later

pspdev · Nov 12, 2021 · 29e17b1 · 29e17b1
1 parent 0a51189
commit 29e17b1
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/.github/workflows/compilation.yml b/.github/workflows/compilation.yml
@@ -19,12 +19,12 @@ jobs:
     - name: Install dependencies Alpine
       if: matrix.os[0] == 'alpine'
       run: |
-        apk add build-base bash git autoconf automake python3 py3-pip cmake pkgconfig libarchive-dev openssl-dev libtool
+        apk add build-base bash git autoconf automake python3 py3-pip cmake pkgconfig libarchive-dev openssl-dev gpgme-dev libtool
     
     - name: Install dependencies Fedora
       if: matrix.os[0] == 'fedora'
       run: |
-        dnf -y install @development-tools g++ wget git autoconf automake python3 python3-pip cmake pkgconf libarchive-devel openssl-devel libtool
+        dnf -y install @development-tools g++ wget git autoconf automake python3 python3-pip cmake pkgconf libarchive-devel openssl-devel gpgme-devel libtool
 
     - name: Compile Tools
       run: |
@@ -47,13 +47,13 @@ jobs:
     - name: Install on Ubuntu
       if: matrix.os[0] == 'ubuntu-latest'
       run: |
-        sudo apt-get -y install libarchive-dev
+        sudo apt-get -y install libarchive-dev libcurl4 libcurl4-openssl-dev libssl-dev libarchive-dev libgpgme-dev
         echo "MSYSTEM=x64" >> $GITHUB_ENV
 
     - name: Install Dependencies Mac
       if: startsWith( matrix.os[0], 'macos' )
       run: |
-        brew install automake libarchive bash openssl libtool
+        brew install automake libarchive bash openssl libarchive gpgme libtool
         echo "MSYSTEM=x64" >> $GITHUB_ENV
 
     - name: Install in MSYS2

diff --git a/Dockerfile b/Dockerfile
@@ -6,7 +6,7 @@ ENV PATH $PATH:${PSPDEV}/bin
 
 COPY . /src
 
-RUN apk add build-base bash git autoconf automake python3 py3-pip cmake pkgconfig libarchive-dev openssl-dev libtool
+RUN apk add build-base bash git autoconf automake python3 py3-pip cmake pkgconfig libarchive-dev openssl-dev gpgme-dev libtool
 RUN cd /src && ./build-all.sh
 
 # Second stage of Dockerfile

diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@ How do I use it?
 
 1. Set up your environment by installing the following software:
 
-        bg++/gcc-c++, gcc, git, autoconf, automake, python3, py3-pip, cmake, pkgconfig, libarchive, openssl and libtool
+        bg++/gcc-c++, gcc, git, autoconf, automake, python3, py3-pip, cmake, pkgconfig, libarchive, openssl, gpmdev and libtool
 
 2. Set the PSPDEV and PATH environmental variables:
 

diff --git a/depends/check-dependencies.sh b/depends/check-dependencies.sh
@@ -50,6 +50,8 @@ function check_program
     missing_depends+=($1); return 1
 }
 
+OSVER=$(uname)
+
 # macOS catalina does not ship headers in default directory anymore
 if [ "$(uname)" == "Darwin" ]; then
   header_paths+=("`xcrun --show-sdk-path`/usr/include")
@@ -64,6 +66,7 @@ check_program   automake
 if [ "${OSVER:0:5}" != MINGW ]; then
 check_program   python3
 check_program   pip3
+check_program   gpgme-config
 check_header    openssl             openssl/crypto.h openssl/include/openssl/crypto.h
 check_header    libarchive          archive.h libarchive/include/archive.h
 fi