chore: rpm: remove unneeded custom cryptopp

M0Rf30 · Sep 5, 2022 · dff11c5 · dff11c5
1 parent 08e797c
commit dff11c5
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 6 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -30,8 +30,8 @@ jobs:
 
       - name: Build
         run: |
-          docker run -v $(pwd)/.ccache:/ccache -v $(pwd):/project -e CCACHE_DIR=/ccache packagefoundation/yap-ubuntu-focal:latest build ubuntu-focal packages
-          docker run -v $(pwd)/.ccache:/ccache -v $(pwd):/project -e CCACHE_DIR=/ccache packagefoundation/yap-rocky-8:latest build rocky-8 packages
+          docker run -v $(pwd)/.ccache:/ccache -v $(pwd):/project -e CCACHE_DIR=/ccache packagefoundation/yap-ubuntu-focal:latest build ubuntu-focal packages/deb
+          docker run -v $(pwd)/.ccache:/ccache -v $(pwd):/project -e CCACHE_DIR=/ccache packagefoundation/yap-rocky-8:latest build rocky-8 packages/rpm
 
           mkdir artifacts_ci
           sudo mv artifacts/*.deb artifacts_ci

diff --git a/libs/meson.build b/libs/meson.build
@@ -13,6 +13,7 @@ podofo_dep = cpp.find_library('libpodofo', dirs : libdir)
 crypto_dep = dependency('libcrypto')
 cryptop_dep = dependency('libcrypto++', required : false)
 cryptopp_dep = dependency('libcryptopp', required : false)
+cryptoppp_dep = dependency('cryptopp', required : false)
 pcsclite_dep = dependency('libpcsclite')
 thread_dep = dependency('threads')
 
@@ -203,15 +204,15 @@ libcie_sign_sdk = static_library(
   'cie-sign-sdk',
   cie_sign_sdk_sources,
   include_directories : inc_a,
-  dependencies : [ crypto_dep, cryptop_dep, cryptopp_dep, libxml2_dep, pcsclite_dep, thread_dep, curl_dep, fontconfig_dep, freetype_dep, png_dep, podofo_dep, xml2_dep ],
+  dependencies : [ crypto_dep, cryptop_dep, cryptopp_dep, cryptoppp_dep, libxml2_dep, pcsclite_dep, thread_dep, curl_dep, fontconfig_dep, freetype_dep, png_dep, podofo_dep, xml2_dep ],
   install : true
 )
 
 libcie_pkcs11 = library(
   'cie-pkcs11',
   cie_pkcs11_sources,
   include_directories : inc_so,
-  dependencies : [ crypto_dep, cryptop_dep, cryptopp_dep, libxml2_dep, pcsclite_dep, png_dep, thread_dep, curl_dep, fontconfig_dep, freetype_dep, xml2_dep ],
+  dependencies : [ crypto_dep, cryptop_dep, cryptopp_dep, cryptoppp_dep, libxml2_dep, pcsclite_dep, png_dep, thread_dep, curl_dep, fontconfig_dep, freetype_dep, xml2_dep ],
   link_with: libcie_sign_sdk,
   install : true,
 )

diff --git a/packages/cie-middleware/PKGBUILD b/packages/cie-middleware/PKGBUILD
@@ -95,6 +95,7 @@ depends:yum=(
     "fontconfig"
     "freetype"
     "java-11-openjdk-headless"
+    "libcurl"
     "libpng"
     "libxml2"
     "openssl"
@@ -107,6 +108,7 @@ makedepends:yum=(
     "freetype-devel"
     "gcc-c++"
     "java-11-openjdk-devel"
+    "libcurl-devel"
     "libpng-devel"
     "libxml2-devel"
     "meson"

diff --git a/packages/yap.json → packages/deb/yap.json b/packages/yap.json → packages/deb/yap.json
@@ -5,11 +5,11 @@
     "output": "artifacts",
     "Projects": [
         {
-            "name": "cryptopp",
+            "name": "../cryptopp",
             "install": true
         },
         {
-            "name": "cie-middleware"
+            "name": "../cie-middleware"
         }
     ]
 }
diff --git a/packages/rpm/yap.json b/packages/rpm/yap.json
@@ -0,0 +1,11 @@
+{
+    "name": "cie-middleware",
+    "Description": "CIE middleware",
+    "build_dir": "/tmp/",
+    "output": "artifacts",
+    "Projects": [
+        {
+            "name": "../cie-middleware"
+        }
+    ]
+}