diff options
| author |   Samuel Bauer <samuel.bauer@yahoo.fr> | 2023-03-07 19:22:39 +0100 |
|---|---|---|
| committer | Samuel Bauer <samuel.bauer@yahoo.fr> | 2023-03-07 19:22:39 +0100 |
| commit | 44a84b6400c24a0d3fe447a42b4d22681e3f4ad9 (patch) | |
| tree | 27cc292a046cac03c183e4fdf6b96b2e89125309 /games-emulation | |
| parent | dev-nim/npeg: add 1.2.1 (diff) | |
| download | guru-44a84b6400c24a0d3fe447a42b4d22681e3f4ad9.tar.gz guru-44a84b6400c24a0d3fe447a42b4d22681e3f4ad9.tar.bz2 guru-44a84b6400c24a0d3fe447a42b4d22681e3f4ad9.zip | |
games-emulation/citra*: cpp-jwt and cryptopp unbundling review
Signed-off-by: Samuel Bauer <samuel.bauer@yahoo.fr>
Diffstat (limited to 'games-emulation')
| -rw-r--r-- | games-emulation/citra-canary/citra-canary-9999.ebuild | 6 | ||||
| -rw-r--r-- | games-emulation/citra/citra-9999.ebuild | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/games-emulation/citra-canary/citra-canary-9999.ebuild b/games-emulation/citra-canary/citra-canary-9999.ebuild index d008cee0b..38d8ea988 100644 --- a/games-emulation/citra-canary/citra-canary-9999.ebuild +++ b/games-emulation/citra-canary/citra-canary-9999.ebuild @@ -96,7 +96,7 @@ src_prepare() { # Fix boost unbundling sed -i -e '/(-DBOOST_ERROR_CODE_HEADER_ONLY/,/)/d' CMakeLists.txt || die - sed -i -e '/[Bb][Oo][Oo][Ss][Tt]/d' externals/CMakeLists.txt || die + sed -i -e '/^# Boost/,/boost)$/d' externals/CMakeLists.txt || die # Unbundle libressl (TODO rework scopes, find_package(OpenSSL is called 5 times) sed -i -e '$afind_package(OpenSSL 1.1)\nset(OPENSSL_LIBRARIES OpenSSL::SSL OpenSSL::Crypto PARENT_SCOPE)' \ @@ -137,7 +137,7 @@ src_prepare() { -e '1ifind_package(PkgConfig REQUIRED)\npkg_check_modules(CRYPTOPP REQUIRED libcryptopp)' \ src/dedicated_room/CMakeLists.txt \ src/core/CMakeLists.txt || die - sed -i -e '/cryptopp-cmake/d' externals/CMakeLists.txt || die + sed -i -e '/^# Crypto++/,/set(CRYPTOPP_COMPILE_DEFINITIONS/d' externals/CMakeLists.txt || die # Unbundle cubeb sed -i -e '/CUBEB/,/endif()/d' externals/CMakeLists.txt || die @@ -150,7 +150,7 @@ src_prepare() { # Unbundle cpp-jwt sed -i -e '/# cpp-jwt/,/CPP_JWT_USE_VENDORED_NLOHMANN_JSON/d' externals/CMakeLists.txt || die - sed -i -e 's/ cpp-jwt//' src/web_service/CMakeLists.txt || die + sed -i -e 's/ cpp-jwt/ ssl crypto/' src/web_service/CMakeLists.txt || die # Unbundle xbyak sed -i -e '/^install(/,/^)$/d' externals/xbyak/CMakeLists.txt || die diff --git a/games-emulation/citra/citra-9999.ebuild b/games-emulation/citra/citra-9999.ebuild index 3350fa698..819b844f6 100644 --- a/games-emulation/citra/citra-9999.ebuild +++ b/games-emulation/citra/citra-9999.ebuild @@ -78,7 +78,7 @@ src_prepare() { # Fix boost unbundling sed -i -e '/(-DBOOST_ERROR_CODE_HEADER_ONLY/,/)/d' CMakeLists.txt || die - sed -i -e '/[Bb][Oo][Oo][Ss][Tt]/d' externals/CMakeLists.txt || die + sed -i -e '/^# Boost/,/boost)$/d' externals/CMakeLists.txt || die # Unbundle libressl (TODO rework scopes, find_package(OpenSSL is called 5 times) sed -i -e '$afind_package(OpenSSL 1.1)\nset(OPENSSL_LIBRARIES OpenSSL::SSL OpenSSL::Crypto PARENT_SCOPE)' \ @@ -119,7 +119,7 @@ src_prepare() { -e '1ifind_package(PkgConfig REQUIRED)\npkg_check_modules(CRYPTOPP REQUIRED libcryptopp)' \ src/dedicated_room/CMakeLists.txt \ src/core/CMakeLists.txt || die - sed -i -e '/cryptopp-cmake/d' externals/CMakeLists.txt || die + sed -i -e '/^# Crypto++/,/set(CRYPTOPP_COMPILE_DEFINITIONS/d' externals/CMakeLists.txt || die # Unbundle cubeb sed -i -e '/CUBEB/,/endif()/d' externals/CMakeLists.txt || die @@ -132,7 +132,7 @@ src_prepare() { # Unbundle cpp-jwt sed -i -e '/# cpp-jwt/,/CPP_JWT_USE_VENDORED_NLOHMANN_JSON/d' externals/CMakeLists.txt || die - sed -i -e 's/ cpp-jwt//' src/web_service/CMakeLists.txt || die + sed -i -e 's/ cpp-jwt/ ssl crypto/' src/web_service/CMakeLists.txt || die # Unbundle xbyak sed -i -e '/^install(/,/^)$/d' externals/xbyak/CMakeLists.txt || die |