commit: 5cbae0ac515311fe8d1c9ed862bbf27fb35a4ce9 Author: Adam Pimentel <adam.pimentel <AT> protonmail <DOT> com> AuthorDate: Tue Dec 20 07:11:56 2022 +0000 Commit: Adam Pimentel <adam.pimentel <AT> protonmail <DOT> com> CommitDate: Tue Dec 20 07:13:22 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=5cbae0ac
net-p2p/feather: try to build monero libs staticially Closes: https://bugs.gentoo.org/884903 Signed-off-by: Adam Pimentel <adam.pimentel <AT> protonmail.com> dev-libs/polyseed/polyseed-9999.ebuild | 2 +- net-p2p/feather/feather-2.1.0.ebuild | 17 +++++++++++++---- net-p2p/feather/feather-9999.ebuild | 21 ++++++++++++++++++++- net-p2p/feather/metadata.xml | 8 +++++++- 4 files changed, 41 insertions(+), 7 deletions(-) diff --git a/dev-libs/polyseed/polyseed-9999.ebuild b/dev-libs/polyseed/polyseed-9999.ebuild index beec61264..007b9bebc 100644 --- a/dev-libs/polyseed/polyseed-9999.ebuild +++ b/dev-libs/polyseed/polyseed-9999.ebuild @@ -5,7 +5,7 @@ EAPI=8 inherit cmake git-r3 -DESCRIPTION="Mnemonic seed library for Monero and other CryptoNote-based currencies. " +DESCRIPTION="Mnemonic seed library for Monero and other CryptoNote-based currencies." HOMEPAGE="https://github.com/tevador/polyseed" SRC_URI="" EGIT_REPO_URI="https://github.com/tevador/polyseed.git" diff --git a/net-p2p/feather/feather-2.1.0.ebuild b/net-p2p/feather/feather-2.1.0.ebuild index 85f844d38..895c163b2 100644 --- a/net-p2p/feather/feather-2.1.0.ebuild +++ b/net-p2p/feather/feather-2.1.0.ebuild @@ -5,9 +5,6 @@ EAPI=8 inherit cmake desktop xdg -#Note: this is like a tree, with dependencies-of-dependencies -#You need to update all of these recursively every version bump. -#But at least they are distfiles if github goes down. ¯\_(ツ)_/¯ SINGLEAPPLICATION_DIST_COMIT="3e8e85d1a487e433751711a8a090659684d42e3b" MONERO_DIST_COMIT="b45c66e9c62d7e8f24abbcb447f408e618bfd450" MINIUPNP_DIST_COMIT="544e6fcc73c5ad9af48a8985c94f0f1d742ef2e0" @@ -101,13 +98,26 @@ src_prepare() { default echo "#define FEATHER_VERSION \"${PV}\"" > "${WORKDIR}"/${PF}/src/config-feather.h || die echo "#define TOR_VERSION \"NOT_EMBEDDED\"" >> "${WORKDIR}"/${PF}/src/config-feather.h || die + + sed -i 's/set(Boost_USE_STATIC_LIBS ON)/set(Boost_USE_STATIC_LIBS OFF)/g' \ + "${WORKDIR}"/${PF}/monero/CMakeLists.txt || die + sed -i 's/set(Boost_USE_STATIC_RUNTIME ON)/set(Boost_USE_STATIC_RUNTIME OFF)/g' \ + "${WORKDIR}"/${PF}/monero/CMakeLists.txt || die + + echo "set(STATIC ON)" > "${WORKDIR}"/${PF}/monero/CMakeLists.txt.2 || die + cat "${WORKDIR}"/${PF}/monero/CMakeLists.txt >> "${WORKDIR}"/${PF}/monero/CMakeLists2.txt || die + mv "${WORKDIR}"/${PF}/monero/CMakeLists2.txt "${WORKDIR}"/${PF}/monero/CMakeLists.txt || die + cmake_src_prepare } src_configure() { local mycmakeargs=( + -DCMAKE_BUILD_TYPE=Release + -DBUILD_SHARED_LIBS=OFF -DARCH=x86-64 -DBUILD_TAG="linux-x64" + -DBUILD_64=ON -DSELF_CONTAINED=OFF -DLOCALMONERO=$(usex localmonero) -DXMRIG=$(usex xmrig) @@ -116,7 +126,6 @@ src_configure() { -DUSE_DEVICE_TREZOR=OFF -DDONATE_BEG=OFF -DWITH_SCANNER=$(usex qrcode) - -DVERSION_IS_RELEASE=ON ) cmake_src_configure diff --git a/net-p2p/feather/feather-9999.ebuild b/net-p2p/feather/feather-9999.ebuild index c06973de0..51dd4c88a 100644 --- a/net-p2p/feather/feather-9999.ebuild +++ b/net-p2p/feather/feather-9999.ebuild @@ -48,8 +48,11 @@ BDEPEND="virtual/pkgconfig" src_configure() { local mycmakeargs=( + -DCMAKE_BUILD_TYPE=Release + -DBUILD_SHARED_LIBS=OFF -DARCH=x86-64 -DBUILD_TAG="linux-x64" + -DBUILD_64=ON -DSELF_CONTAINED=OFF -DLOCALMONERO=$(usex localmonero) -DXMRIG=$(usex xmrig) @@ -58,12 +61,28 @@ src_configure() { -DUSE_DEVICE_TREZOR=OFF -DDONATE_BEG=OFF -DWITH_SCANNER=$(usex qrcode) - -DVERSION_IS_RELEASE=OFF ) cmake_src_configure } +src_prepare() { + default + echo "#define FEATHER_VERSION \"${PV}\"" > "${WORKDIR}"/${PF}/src/config-feather.h || die + echo "#define TOR_VERSION \"NOT_EMBEDDED\"" >> "${WORKDIR}"/${PF}/src/config-feather.h || die + + sed -i 's/set(Boost_USE_STATIC_LIBS ON)/set(Boost_USE_STATIC_LIBS OFF)/g' \ + "${WORKDIR}"/${PF}/monero/CMakeLists.txt || die + sed -i 's/set(Boost_USE_STATIC_RUNTIME ON)/set(Boost_USE_STATIC_RUNTIME OFF)/g' \ + "${WORKDIR}"/${PF}/monero/CMakeLists.txt || die + + echo "set(STATIC ON)" > "${WORKDIR}"/${PF}/monero/CMakeLists.txt.2 || die + cat "${WORKDIR}"/${PF}/monero/CMakeLists.txt >> "${WORKDIR}"/${PF}/monero/CMakeLists2.txt || die + mv "${WORKDIR}"/${PF}/monero/CMakeLists2.txt "${WORKDIR}"/${PF}/monero/CMakeLists.txt || die + + cmake_src_prepare +} + src_compile() { cmake_build feather } diff --git a/net-p2p/feather/metadata.xml b/net-p2p/feather/metadata.xml index 97b712586..4f6ad6740 100644 --- a/net-p2p/feather/metadata.xml +++ b/net-p2p/feather/metadata.xml @@ -1,7 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person"> + <email>adam.pimente...@gmail.com</email> + <name>Adam Pimentel</name> + </maintainer> + <upstream> + <remote-id type="github">feather-wallet/feather</remote-id> + </upstream> <longdescription lang="en"> Feather is a free, open-source Monero wallet for Linux, Tails, Windows and macOS. It is: